Changeset 735 for cprs/branches/tmg-cprs/CPRS-Chart/Templates

Timestamp:

Apr 9, 2010, 9:13:04 AM (14 years ago)

Author:

Kevin Toppenberg

Message:

Template formulas will calculate even if responses have characters, bug fixes

Location:

cprs/branches/tmg-cprs/CPRS-Chart/Templates

Files:

• fTemplateDialog.pas (modified) (3 diffs)
• uTemplateFields.pas (modified) (5 diffs)

cprs/branches/tmg-cprs/CPRS-Chart/Templates/fTemplateDialog.pas

@@ -219 +219 @@
     frmTemplateDialog.HTMLAnswerOpenTag := '<I>'; //kt 12/28/09
     //SL.Text := RemoveHTMLTags(SL.Text);  //elh
+    HideFormulas(SL,frmTemplateDialog.Formulas); //kt added 3/26/10
     AssignFieldIDs(SL,frmTemplateDialog.NameToObjID);   //kt  added NameToObjID param 3/26/10
-    HideFormulas(SL,frmTemplateDialog.Formulas); //kt added 3/26/10
     HideTxtObjects(SL,frmTemplateDialog.TxtObjects); //kt added 3/28/10
     frmTemplateDialog.SL := SL;
@@ -230 +230 @@
     frmTemplateDialog.FirstIndent := 99999;
     repeat
+    //messagedlg(Txt,mtInformation,mbOKCancel,0);
       i := pos(ObjMarker, Txt);
       if(i > 1) then begin
@@ -280 +281 @@
           //kt -- end mod --
           GetText(SL, TRUE);     {TRUE = Include embedded fields}
-          {
-          if uTemplates.bUsingHTMLMode then begin
-             SL.Text := FormatHTMLTags(SL.Text);
-          end else begin
-             SL.Text := RemoveHTMLTags(SL.Text);
-          end;
-          }
         end else begin
           if (not PreviewMode) and (not frmTemplateDialog.Silent) and (not uInit.TimedOut) then begin

cprs/branches/tmg-cprs/CPRS-Chart/Templates/uTemplateFields.pas

@@ -198 +198 @@
 function StripEmbedded(iItems: string): string;
 function CloseCharPos(OpenChar, CloseChar : char; var Txt : string; StartingPos : integer=1) : integer; //kt added
+function FormatFormula(test: string): string;  //elh  04/09/10
 
 type
@@ -549 +550 @@
     //p2 := PosEx(FN_END_TAG,Txt,p1);
     p2 := CloseCharPos(FN_BEGIN_TAG, FN_END_TAG, Txt, p1);
-    SubStrB := MidStr(Txt,p2+1,999);
+    SubStrB := MidStr(Txt,p2+1,99999);    //Changed from 999 to 99999. Some characters were getting lost including the dialog tags that trigger the dialog box   elh  04/08/10
     FnStr := MidStr(Txt,p1, (p2-p1));
     FnStr := AnsiReplaceText(FnStr,#9,'');
@@ -647 +648 @@
     FldName := NameToObjID.Strings[i];
     for j := 0 to i do begin
-      if NameToObjID.Strings[i] = FldName then inc(CountofSimilar);
+      if NameToObjID.Strings[j] = FldName then inc(CountofSimilar);     //Changed from i to j  elh  04/08/10
     end;
     CountOfSimStr := IntToStr(CountofSimilar);
@@ -1123 +1124 @@
           FnObjStr := FN_OBJ_TAG + FnObjStr + ']';
         end;
+        FnObjStr := FormatFormula(FnObjStr);  //Added to remove all characters from the formula  elh  4/9/10
         if (Pos(FN_OBJ_TAG,FnObjStr)>0) then begin
           EvalTIUObjects(FnObjStr);
@@ -3021 +3023 @@
 end;
 
+function FormatFormula(test: string): string;
+var
+   test2: string;
+   i: integer;
+begin
+   for i := 1 to length(test) do begin
+      if test[i] in ['0'..'9','+','-','*','/','(',')','^'] then begin
+         test2 := test2 + test[i];
+      end;
+   end;
+   Result := test2;
+end;
+
 initialization