C2021-059 Attempting to resolve conflicts try 1

2021-059 - Matchicng Paul's Changes
C2021-059 - Update designer to avoid conflict
2024-08-01 14:52:38 -04:00 · 2024-08-01 14:49:14 -04:00 · 2024-08-01 14:41:34 -04:00 · 2024-08-01 11:01:28 -04:00 · 2024-08-01 09:23:30 -04:00 · 2024-07-30 08:54:13 -04:00
317 changed files with 3234 additions and 2132 deletions
--- a/PROMS/Formats/fmtall/AEPAPPRall.xml
+++ b/PROMS/Formats/fmtall/AEPAPPRall.xml
--- a/PROMS/Formats/fmtall/AEPCHID_00all.xml
+++ b/PROMS/Formats/fmtall/AEPCHID_00all.xml
--- a/PROMS/Formats/fmtall/AEPCHIDall.xml
+++ b/PROMS/Formats/fmtall/AEPCHIDall.xml
--- a/PROMS/Formats/fmtall/AEPDEVall.xml
+++ b/PROMS/Formats/fmtall/AEPDEVall.xml
--- a/PROMS/Formats/fmtall/AEPSAMGFPall.xml
+++ b/PROMS/Formats/fmtall/AEPSAMGFPall.xml
--- a/PROMS/Formats/fmtall/AEPSAMG_01all.xml
+++ b/PROMS/Formats/fmtall/AEPSAMG_01all.xml
--- a/PROMS/Formats/fmtall/AEPSAMG_02all.xml
+++ b/PROMS/Formats/fmtall/AEPSAMG_02all.xml
--- a/PROMS/Formats/fmtall/AEPSAMGall.xml
+++ b/PROMS/Formats/fmtall/AEPSAMGall.xml
--- a/PROMS/Formats/fmtall/AEP_00all.xml
+++ b/PROMS/Formats/fmtall/AEP_00all.xml
--- a/PROMS/Formats/fmtall/AEP_01all.xml
+++ b/PROMS/Formats/fmtall/AEP_01all.xml
--- a/PROMS/Formats/fmtall/AEP_02all.xml
+++ b/PROMS/Formats/fmtall/AEP_02all.xml
--- a/PROMS/Formats/fmtall/AEPall.xml
+++ b/PROMS/Formats/fmtall/AEPall.xml
--- a/PROMS/Formats/fmtall/BASEall.xml
+++ b/PROMS/Formats/fmtall/BASEall.xml
--- a/PROMS/Formats/fmtall/BGEALNall.xml
+++ b/PROMS/Formats/fmtall/BGEALNall.xml
--- a/PROMS/Formats/fmtall/BGEEOP_00all.xml
+++ b/PROMS/Formats/fmtall/BGEEOP_00all.xml
--- a/PROMS/Formats/fmtall/BGEEOPall.xml
+++ b/PROMS/Formats/fmtall/BGEEOPall.xml
--- a/PROMS/Formats/fmtall/BGEOI_00all.xml
+++ b/PROMS/Formats/fmtall/BGEOI_00all.xml
--- a/PROMS/Formats/fmtall/BGEOIall.xml
+++ b/PROMS/Formats/fmtall/BGEOIall.xml
--- a/PROMS/Formats/fmtall/BGESAM1all.xml
+++ b/PROMS/Formats/fmtall/BGESAM1all.xml
--- a/PROMS/Formats/fmtall/BGESTPall.xml
+++ b/PROMS/Formats/fmtall/BGESTPall.xml
--- a/PROMS/Formats/fmtall/BGEVLall.xml
+++ b/PROMS/Formats/fmtall/BGEVLall.xml
--- a/PROMS/Formats/fmtall/BNPP1Newall.xml
+++ b/PROMS/Formats/fmtall/BNPP1Newall.xml
--- a/PROMS/Formats/fmtall/BNPP1all.xml
+++ b/PROMS/Formats/fmtall/BNPP1all.xml
--- a/PROMS/Formats/fmtall/BNPP2all.xml
+++ b/PROMS/Formats/fmtall/BNPP2all.xml
--- a/PROMS/Formats/fmtall/BNPPalrall.xml
+++ b/PROMS/Formats/fmtall/BNPPalrall.xml
--- a/PROMS/Formats/fmtall/BNPPbckall.xml
+++ b/PROMS/Formats/fmtall/BNPPbckall.xml
--- a/PROMS/Formats/fmtall/BNPPsamall.xml
+++ b/PROMS/Formats/fmtall/BNPPsamall.xml
--- a/PROMS/Formats/fmtall/BVPS1all.xml
+++ b/PROMS/Formats/fmtall/BVPS1all.xml
--- a/PROMS/Formats/fmtall/BVPS2all.xml
+++ b/PROMS/Formats/fmtall/BVPS2all.xml
--- a/PROMS/Formats/fmtall/BVPSAOPDEVall.xml
+++ b/PROMS/Formats/fmtall/BVPSAOPDEVall.xml
--- a/PROMS/Formats/fmtall/BVPSAOPall.xml
+++ b/PROMS/Formats/fmtall/BVPSAOPall.xml
--- a/PROMS/Formats/fmtall/BVPSAtchall.xml
+++ b/PROMS/Formats/fmtall/BVPSAtchall.xml
--- a/PROMS/Formats/fmtall/BVPSBCKall.xml
+++ b/PROMS/Formats/fmtall/BVPSBCKall.xml
--- a/PROMS/Formats/fmtall/BVPSDEVall.xml
+++ b/PROMS/Formats/fmtall/BVPSDEVall.xml
--- a/PROMS/Formats/fmtall/BVPSFlexDEVall.xml
+++ b/PROMS/Formats/fmtall/BVPSFlexDEVall.xml
--- a/PROMS/Formats/fmtall/BVPSNIBCKall.xml
+++ b/PROMS/Formats/fmtall/BVPSNIBCKall.xml
--- a/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml
+++ b/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml
--- a/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml
+++ b/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml
--- a/PROMS/Formats/fmtall/BVPSSAMGall.xml
+++ b/PROMS/Formats/fmtall/BVPSSAMGall.xml
--- a/PROMS/Formats/fmtall/CAL1all.xml
+++ b/PROMS/Formats/fmtall/CAL1all.xml
--- a/PROMS/Formats/fmtall/CAL2_00all.xml
+++ b/PROMS/Formats/fmtall/CAL2_00all.xml
--- a/PROMS/Formats/fmtall/CAL2all.xml
+++ b/PROMS/Formats/fmtall/CAL2all.xml
--- a/PROMS/Formats/fmtall/CALBCKall.xml
+++ b/PROMS/Formats/fmtall/CALBCKall.xml
--- a/PROMS/Formats/fmtall/CALFSGBCKall.xml
+++ b/PROMS/Formats/fmtall/CALFSGBCKall.xml
--- a/PROMS/Formats/fmtall/CALOTOall.xml
+++ b/PROMS/Formats/fmtall/CALOTOall.xml
--- a/PROMS/Formats/fmtall/CALSAMall.xml
+++ b/PROMS/Formats/fmtall/CALSAMall.xml
--- a/PROMS/Formats/fmtall/CATADEVall.xml
+++ b/PROMS/Formats/fmtall/CATADEVall.xml
--- a/PROMS/Formats/fmtall/CATBOXall.xml
+++ b/PROMS/Formats/fmtall/CATBOXall.xml
--- a/PROMS/Formats/fmtall/CATDEVall.xml
+++ b/PROMS/Formats/fmtall/CATDEVall.xml
--- a/PROMS/Formats/fmtall/CATEBCKall.xml
+++ b/PROMS/Formats/fmtall/CATEBCKall.xml
--- a/PROMS/Formats/fmtall/CATSAMall.xml
+++ b/PROMS/Formats/fmtall/CATSAMall.xml
--- a/PROMS/Formats/fmtall/CATall.xml
+++ b/PROMS/Formats/fmtall/CATall.xml
--- a/PROMS/Formats/fmtall/CPBCK2NHCall.xml
+++ b/PROMS/Formats/fmtall/CPBCK2NHCall.xml
--- a/PROMS/Formats/fmtall/CPBCK2all.xml
+++ b/PROMS/Formats/fmtall/CPBCK2all.xml
--- a/PROMS/Formats/fmtall/CPBCKNHC_00all.xml
+++ b/PROMS/Formats/fmtall/CPBCKNHC_00all.xml
--- a/PROMS/Formats/fmtall/CPBCKNHC_01all.xml
+++ b/PROMS/Formats/fmtall/CPBCKNHC_01all.xml
--- a/PROMS/Formats/fmtall/CPBCKNHCall.xml
+++ b/PROMS/Formats/fmtall/CPBCKNHCall.xml
--- a/PROMS/Formats/fmtall/CPBCK_00all.xml
+++ b/PROMS/Formats/fmtall/CPBCK_00all.xml
--- a/PROMS/Formats/fmtall/CPBCK_01all.xml
+++ b/PROMS/Formats/fmtall/CPBCK_01all.xml
--- a/PROMS/Formats/fmtall/CPBCKall.xml
+++ b/PROMS/Formats/fmtall/CPBCKall.xml
--- a/PROMS/Formats/fmtall/CPDEVall.xml
+++ b/PROMS/Formats/fmtall/CPDEVall.xml
--- a/PROMS/Formats/fmtall/CPFDEVall.xml
+++ b/PROMS/Formats/fmtall/CPFDEVall.xml
--- a/PROMS/Formats/fmtall/CPFDataall.xml
+++ b/PROMS/Formats/fmtall/CPFDataall.xml
--- a/PROMS/Formats/fmtall/CPLAall.xml
+++ b/PROMS/Formats/fmtall/CPLAall.xml
--- a/PROMS/Formats/fmtall/CPLRDEVall.xml
+++ b/PROMS/Formats/fmtall/CPLRDEVall.xml
--- a/PROMS/Formats/fmtall/CPLS2all.xml
+++ b/PROMS/Formats/fmtall/CPLS2all.xml
--- a/PROMS/Formats/fmtall/CPLSAMall.xml
+++ b/PROMS/Formats/fmtall/CPLSAMall.xml
--- a/PROMS/Formats/fmtall/CPLSDEVall.xml
+++ b/PROMS/Formats/fmtall/CPLSDEVall.xml
--- a/PROMS/Formats/fmtall/CPLSSDDall.xml
+++ b/PROMS/Formats/fmtall/CPLSSDDall.xml
--- a/PROMS/Formats/fmtall/CPLSSUMall.xml
+++ b/PROMS/Formats/fmtall/CPLSSUMall.xml
--- a/PROMS/Formats/fmtall/CPLSall.xml
+++ b/PROMS/Formats/fmtall/CPLSall.xml
--- a/PROMS/Formats/fmtall/CPL_00all.xml
+++ b/PROMS/Formats/fmtall/CPL_00all.xml
--- a/PROMS/Formats/fmtall/CPL_01all.xml
+++ b/PROMS/Formats/fmtall/CPL_01all.xml
--- a/PROMS/Formats/fmtall/CPL_02all.xml
+++ b/PROMS/Formats/fmtall/CPL_02all.xml
--- a/PROMS/Formats/fmtall/CPL_03all.xml
+++ b/PROMS/Formats/fmtall/CPL_03all.xml
--- a/PROMS/Formats/fmtall/CPLall.xml
+++ b/PROMS/Formats/fmtall/CPLall.xml
--- a/PROMS/Formats/fmtall/CPSAMGDEVall.xml
+++ b/PROMS/Formats/fmtall/CPSAMGDEVall.xml
--- a/PROMS/Formats/fmtall/CPSAMGDataall.xml
+++ b/PROMS/Formats/fmtall/CPSAMGDataall.xml
--- a/PROMS/Formats/fmtall/CWEDEVall.xml
+++ b/PROMS/Formats/fmtall/CWEDEVall.xml
--- a/PROMS/Formats/fmtall/CWER_00all.xml
+++ b/PROMS/Formats/fmtall/CWER_00all.xml
--- a/PROMS/Formats/fmtall/CWER_01all.xml
+++ b/PROMS/Formats/fmtall/CWER_01all.xml
--- a/PROMS/Formats/fmtall/CWERall.xml
+++ b/PROMS/Formats/fmtall/CWERall.xml
--- a/PROMS/Formats/fmtall/CWE_00all.xml
+++ b/PROMS/Formats/fmtall/CWE_00all.xml
--- a/PROMS/Formats/fmtall/CWE_01all.xml
+++ b/PROMS/Formats/fmtall/CWE_01all.xml
--- a/PROMS/Formats/fmtall/CWEall.xml
+++ b/PROMS/Formats/fmtall/CWEall.xml
--- a/PROMS/Formats/fmtall/ComPeakFlex11all.xml
+++ b/PROMS/Formats/fmtall/ComPeakFlex11all.xml
--- a/PROMS/Formats/fmtall/ComPeakFlexall.xml
+++ b/PROMS/Formats/fmtall/ComPeakFlexall.xml
--- a/PROMS/Formats/fmtall/EBCKall.xml
+++ b/PROMS/Formats/fmtall/EBCKall.xml
--- a/PROMS/Formats/fmtall/EFSGBCKall.xml
+++ b/PROMS/Formats/fmtall/EFSGBCKall.xml
--- a/PROMS/Formats/fmtall/ELFDEVall.xml
+++ b/PROMS/Formats/fmtall/ELFDEVall.xml
--- a/PROMS/Formats/fmtall/ENall.xml
+++ b/PROMS/Formats/fmtall/ENall.xml
--- a/PROMS/Formats/fmtall/ESFDEVall.xml
+++ b/PROMS/Formats/fmtall/ESFDEVall.xml
--- a/PROMS/Formats/fmtall/EXCLN_00all.xml
+++ b/PROMS/Formats/fmtall/EXCLN_00all.xml
--- a/PROMS/Formats/fmtall/EXCLN_01all.xml
+++ b/PROMS/Formats/fmtall/EXCLN_01all.xml
--- a/PROMS/Formats/fmtall/EXCLNall.xml
+++ b/PROMS/Formats/fmtall/EXCLNall.xml
--- a/PROMS/Formats/fmtall/EXEAOPBCKall.xml
+++ b/PROMS/Formats/fmtall/EXEAOPBCKall.xml
--- a/PROMS/Formats/fmtall/EXEBCK_00all.xml
+++ b/PROMS/Formats/fmtall/EXEBCK_00all.xml
--- a/PROMS/Formats/fmtall/EXEBCKall.xml
+++ b/PROMS/Formats/fmtall/EXEBCKall.xml
--- a/PROMS/Formats/fmtall/EXEDEVall.xml
+++ b/PROMS/Formats/fmtall/EXEDEVall.xml
--- a/PROMS/Formats/fmtall/EXEFLXBCKall.xml
+++ b/PROMS/Formats/fmtall/EXEFLXBCKall.xml
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kevin Laskey	c05e493579	C2021-059 Attempting to resolve conflicts try 1	2024-08-01 14:52:38 -04:00
Kevin Laskey	2714973c16	2021-059 - Matchicng Paul's Changes	2024-08-01 14:49:14 -04:00
Kevin Laskey	5f86d8c629	C2021-059 - Update designer to avoid conflict	2024-08-01 14:41:34 -04:00
Kevin Laskey	977ea6f5fc	C2021-059 - Update proms sql fixes with correct numbers	2024-08-01 11:01:28 -04:00
Kevin Laskey	a8bbda1281	C2024-005 - Completed some updates for nested folder selection (parent unselect)	2024-08-01 09:23:30 -04:00
Kevin Laskey	da1b061eb1	C2024-005 - Added orphan record clearing progress bar, confirmation message	2024-07-30 08:54:13 -04:00
Kevin Laskey	4644699df0	C20240-005 - Deleting Folder additions	2024-07-29 15:57:54 -04:00
Kevin Laskey	6e6abbd759	C2024-005 - Kevin working on folder retrieval	2024-07-22 09:28:48 -04:00