From c926ddbe60f2ed7e8c49dcc84ab2031d90b6bcd2 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 8 Apr 2014 21:00:07 +0000 Subject: [PATCH] Add Hex values for Placekeepers and PhoneList checks Logic to put Placekeeper and Phonelist info in the section config Logic to put Placekeeper info in the step config --- PROMS/DataLoader/Loader.cs | 3 ++- PROMS/DataLoader/Sections.cs | 11 ++++++++--- PROMS/DataLoader/Steps.cs | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/PROMS/DataLoader/Loader.cs b/PROMS/DataLoader/Loader.cs index 50a38d2d..8b6e0007 100644 --- a/PROMS/DataLoader/Loader.cs +++ b/PROMS/DataLoader/Loader.cs @@ -27,7 +27,8 @@ namespace DataLoader private static int PH = 0x02; private static int TOC = 0x04; private static int AUTOIND = 0x08; - private static int AUTOGEN = 0x40; + private static int PLACEKEEPER = 0x40; + private static int PHONELIST = 0x10; private static int STP_MULT_CHGID = 1; private static int STP_LNK_SEQ = 2; diff --git a/PROMS/DataLoader/Sections.cs b/PROMS/DataLoader/Sections.cs index 9840e765..9180a61a 100644 --- a/PROMS/DataLoader/Sections.cs +++ b/PROMS/DataLoader/Sections.cs @@ -513,11 +513,16 @@ namespace DataLoader ci.AddItem("Step", "LnkEnh", "Y"); } // determine if autogenerated section (!exist = N) - if ((cbittst & AUTOGEN) > 1) + // Placekeeper (Calvert) + if ((cbittst & PLACEKEEPER) > 1) { isautogen = true; - ci.AddItem("Section", "AutoGen", "Y"); + //ci.AddItem("Section", "AutoGen", "Y"); + ci.AddItem("Section", "Placekeeper", "Y"); } + // Phonelist (Clavert) + if ((cbittst & PHONELIST) > 1) + ci.AddItem("Section", "Phonelist", "Y"); // Here are subsection flags, i.e. the following are only set if this // is a subsection. bool didsub = false; @@ -670,7 +675,7 @@ namespace DataLoader // 5 = RNO // 6 = step // 7 = table - //isautogen = false; //needed for bge + isautogen = false; //needed for bge if (!isautogen) { // Process the Data Table - First look for High Level Steps diff --git a/PROMS/DataLoader/Steps.cs b/PROMS/DataLoader/Steps.cs index 57c29b70..58c7200f 100644 --- a/PROMS/DataLoader/Steps.cs +++ b/PROMS/DataLoader/Steps.cs @@ -59,6 +59,10 @@ namespace DataLoader string seqcvt = stpseq; + //check for Placekeeper flag + if (Recid[0] == 9617) //(Recid[0] != '0') // placekeeper seq[8] & 0x40 + ci.AddItem("Step", "Placekeeper", "True"); + string newstptyp = null; bool ManualPagebreak = false; char cbittst = StepType.PadRight(2)[0];