From 284d6d0a5ee34bc75f140a9278c765904dd56758 Mon Sep 17 00:00:00 2001 From: Raymond Brady Date: Tue, 26 Jul 2016 17:39:11 -0500 Subject: [PATCH 1/6] remove dreamweaver _notes folders, remove echo text, add gitignore to ignore DW _notes --- .gitignore | 1 + src/classes/_notes/dwsync.xml | 4 ---- src/dbquery/_notes/dwsync.xml | 4 ---- src/dbquery/qryGROUP/_notes/dwsync.xml | 4 ---- src/dbquery/qryUSER/_notes/dwsync.xml | 4 ---- src/page_content/ADMIN/_notes/dwsync.xml | 5 ----- src/resources/library/forms_db_controller.php | 2 +- 7 files changed, 2 insertions(+), 22 deletions(-) create mode 100644 .gitignore delete mode 100644 src/classes/_notes/dwsync.xml delete mode 100644 src/dbquery/_notes/dwsync.xml delete mode 100644 src/dbquery/qryGROUP/_notes/dwsync.xml delete mode 100644 src/dbquery/qryUSER/_notes/dwsync.xml delete mode 100644 src/page_content/ADMIN/_notes/dwsync.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a24bab5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +_notes/ \ No newline at end of file diff --git a/src/classes/_notes/dwsync.xml b/src/classes/_notes/dwsync.xml deleted file mode 100644 index c41608b..0000000 --- a/src/classes/_notes/dwsync.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/dbquery/_notes/dwsync.xml b/src/dbquery/_notes/dwsync.xml deleted file mode 100644 index d0995bc..0000000 --- a/src/dbquery/_notes/dwsync.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/dbquery/qryGROUP/_notes/dwsync.xml b/src/dbquery/qryGROUP/_notes/dwsync.xml deleted file mode 100644 index 73bb1e4..0000000 --- a/src/dbquery/qryGROUP/_notes/dwsync.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/dbquery/qryUSER/_notes/dwsync.xml b/src/dbquery/qryUSER/_notes/dwsync.xml deleted file mode 100644 index db1e8f0..0000000 --- a/src/dbquery/qryUSER/_notes/dwsync.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/page_content/ADMIN/_notes/dwsync.xml b/src/page_content/ADMIN/_notes/dwsync.xml deleted file mode 100644 index 632fa37..0000000 --- a/src/page_content/ADMIN/_notes/dwsync.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/resources/library/forms_db_controller.php b/src/resources/library/forms_db_controller.php index 092e769..6ccca32 100644 --- a/src/resources/library/forms_db_controller.php +++ b/src/resources/library/forms_db_controller.php @@ -199,7 +199,7 @@ public function renderFormsList() $delformid = "delform" . $formid; echo "
-X".$pg_encrypt_key."
"; +X"; echo ""; } echo ""; From 39a0a730b269b1b822b488aedd2d951fb181b314 Mon Sep 17 00:00:00 2001 From: Raymond Brady Date: Thu, 4 Aug 2016 06:53:52 -0500 Subject: [PATCH 2/6] empty district level approver list validates and works. --- src/includes/pageformsbuild.php | 3 ++- src/resources/library/approver.php | 10 ++++++++++ src/resources/library/forms_db_controller.php | 1 - src/views/createworkorder.php | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/includes/pageformsbuild.php b/src/includes/pageformsbuild.php index 4a22218..c0efb70 100644 --- a/src/includes/pageformsbuild.php +++ b/src/includes/pageformsbuild.php @@ -83,7 +83,7 @@ function handleNotificationsSelectOnChange(value) - + @@ -274,6 +274,7 @@ function handleNotificationsSelectOnChange(value) $(template).formRender(formRenderOpts); jQuery('#formPreviewModal').modal(); }); + // Use the required attribute on required form fields, then set the message below for the form field. jQuery("#formsaveform").validate({ submitHandler: function(form){ var xmlString = formBuilder.data('formBuilder').formData; diff --git a/src/resources/library/approver.php b/src/resources/library/approver.php index ced2bf1..3a3bebd 100644 --- a/src/resources/library/approver.php +++ b/src/resources/library/approver.php @@ -178,6 +178,16 @@ public static function MergeApproverArrays($groupApprovers, $approvers) return $approvers; } } + /** Parse raw workflow data from form element. Expects a CSV of email addresses. returns array of email addresses. */ + public static function ParseRawWorkflowData($workflowCsvData) + { + if ($workflowCsvData == "") { + $approverArray = array(); + } else { + $approverArray = explode(',', $workflowCsvData); + } + return $approverArray; + } } /** Approve State for Workorders */ diff --git a/src/resources/library/forms_db_controller.php b/src/resources/library/forms_db_controller.php index 3932b9f..b498677 100644 --- a/src/resources/library/forms_db_controller.php +++ b/src/resources/library/forms_db_controller.php @@ -61,7 +61,6 @@ public function verifyAddFormFields($name, $desc, $xml, $workflow, $notifyOnFina if ($desc == ""){$valid = False;} if ($xml !== ""){ // TODO: Check for valid XML - if ($workflow == ""){$valid = false;} } return $valid; } diff --git a/src/views/createworkorder.php b/src/views/createworkorder.php index 7d3fd2b..6a66a98 100644 --- a/src/views/createworkorder.php +++ b/src/views/createworkorder.php @@ -68,7 +68,7 @@ $formName = $formPostHandler->formName; //$_POST['form-name']; $formDescription = $formPostHandler->formDescription; //$_POST['form-description']; // Form Workflow field holds array of approver email addresses. We need to transform this to work with the data. - $approverArray = explode(',', $form['Workflow']); + $approverArray = ApproverHelper::ParseRawWorkflowData($form['Workflow']); $approvers = ApproverHelper::NewApproverArrayFromEmailArray($approverArray); // Get the groupWorkflow for the users group $groupWorkflows = $form['GroupWorkflows']; From 4a81052d1c1c7ed8e8ed3dc2f4ca38e536f138e3 Mon Sep 17 00:00:00 2001 From: Raymond Brady Date: Thu, 4 Aug 2016 08:47:05 -0500 Subject: [PATCH 3/6] Fixes #11 --- src/includes/pageformsbuild.php | 1 - src/resources/library/workorder.php | 4 +++- src/views/workorder.php | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/includes/pageformsbuild.php b/src/includes/pageformsbuild.php index c0efb70..cb0aeb7 100644 --- a/src/includes/pageformsbuild.php +++ b/src/includes/pageformsbuild.php @@ -239,7 +239,6 @@ function handleNotificationsSelectOnChange(value) -hello