Remove references to the retired MergeSync module

snprc_ehr/resources/web/snprc_ehr/Panel/LabworkRequestDataEntryPanel.js

@@ -7,34 +7,10 @@ Ext4.define('SNPRC_EHR.panel.LabworkRequestDataEntryPanel', {
     extend: 'EHR.panel.RequestDataEntryPanel',
     alias: 'widget.snprc-labworkrequestdataentrypanel',
 
-    initComponent: function(){
-        var mergeURL = LABKEY.getModuleProperty('MergeSync', 'MergeURL');
-
-        this.callParent(arguments);
-    },
-
     onStoreCollectionCommitComplete: function(sc, extraContext){
         if (Ext4.Msg.isVisible())
             Ext4.Msg.hide();
 
-        if (extraContext && extraContext.successURL){
-            var mergeURL = LABKEY.getModuleProperty('MergeSync', 'MergeURL');
-            if (mergeURL){
-                Ext4.Msg.confirm('Success', 'The requests have been synced to merge.  Do you want to open merge now?' +
-                        (!Ext4.isIE ? '  Note: merge does not work well in any browser besides IE, and you may want to switch to that browser.' : ''), function(val){
-                    window.onbeforeunload = Ext4.emptyFn;
-                    if (val == 'yes'){
-                        window.location = mergeURL;
-                    }
-                    else {
-                        window.location = extraContext.successURL;
-                    }
-                }, this);
-
-                return;
-            }
-        }
-
         this.callParent(arguments);
     }
 });

snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRModule.java

@@ -307,7 +307,6 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
 //        EHRService.get().registerFormType(new DefaultDataEntryFormFactory(AuxProcedureFormType.class, this));
 //        EHRService.get().registerFormType(new DefaultDataEntryFormFactory(ASBRequestFormType.class, this));
 //        EHRService.get().registerFormType(new DefaultDataEntryFormFactory(ColonyRequestFormType.class, this));
-//        // Requires mergesync
           // EHRService.get().registerFormType(new DefaultDataEntryFormFactory(LabworkRequestFormType.class, this));
 //        EHRService.get().registerFormType(new DefaultDataEntryFormFactory(HousingRequestFormType.class, this));
 //        EHRService.get().registerFormType(new DefaultDataEntryFormFactory(BloodRequestBulkEditFormType.class, this));

snprc_ehr/src/org/labkey/snprc_ehr/dataentry/dataentry/LabworkRequestFormType.java

@@ -40,7 +40,6 @@ public LabworkRequestFormType(DataEntryFormContext ctx, Module owner)
     {
         super(ctx, owner, NAME, LABEL, "Requests", Arrays.<FormSection>asList(
                 new RequestFormSection(),
-                new LabworkRequestInstructionsFormSection(),
                 new AnimalDetailsFormSection(),
                 new ClinpathRunsFormSection(true)
         ));
@@ -53,7 +52,6 @@ public LabworkRequestFormType(DataEntryFormContext ctx, Module owner)
             //Added 2-8-2016 Blasa
         addClientDependency(ClientDependency.supplierFromPath("snprc_ehr/model/sources/labworkPanel.js"));
 
-        addClientDependency(ClientDependency.supplierFromModuleName("MergeSync"));
         addClientDependency(ClientDependency.supplierFromPath("snprc_ehr/panel/LabworkRequestDataEntryPanel.js"));
         setJavascriptClass("SNPRC_EHR.panel.LabworkRequestDataEntryPanel");
     }