From 4c0a0f57211643c3186ab925995d44b011a79668 Mon Sep 17 00:00:00 2001 From: ITKJuhoon <59675404+ITKJuhoon@users.noreply.github.com> Date: Fri, 18 Oct 2024 22:08:38 -0700 Subject: [PATCH 1/2] Update caps_Submission.Form.js updated the message and logic check on three file fields --- .../Scripts/FormHandler/caps_Submission.Form.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CAPS/WebResources/Scripts/FormHandler/caps_Submission.Form.js b/CAPS/WebResources/Scripts/FormHandler/caps_Submission.Form.js index 6b954ef..9a7a67a 100644 --- a/CAPS/WebResources/Scripts/FormHandler/caps_Submission.Form.js +++ b/CAPS/WebResources/Scripts/FormHandler/caps_Submission.Form.js @@ -162,10 +162,10 @@ CAPS.Submission.checkSupportingDocuments = function (executionContext) { var supportingDocumentName = result.caps_name; var capitalPlanResponseLetter = result.caps_capitalplanresponseletter; var capitalBylaw = result.caps_capitalbylaw; - var childCareDeclaration = result.caps_childcaredeclaration; + //var childCareDeclaration = result.caps_childcaredeclaration; //var capitalPlanSupportingDocumentName = result.caps_name; - if (capitalPlanResponseLetter === null || capitalBylaw === null || childCareDeclaration === null) { - formContext.ui.setFormNotification("At least one of the supporting documents is missing. Please click the supporting documents record \"" + supportingDocumentName + "\" to upload necessary files in the Submission tab below.", "WARNING", "MissingSupportingDocumentsBanner"); + if (capitalPlanResponseLetter === null || capitalBylaw === null) { + formContext.ui.setFormNotification("Either CPRL or Bylaw supporting document is missing. Please click the supporting documents record \"" + supportingDocumentName + "\" to upload necessary files in the Submission tab below.", "WARNING", "MissingSupportingDocumentsBanner"); } else { formContext.ui.clearFormNotification("MissingSupportingDocumentsBanner"); From f65dbf2bd5009f3ec4cb1875243c6149853affe4 Mon Sep 17 00:00:00 2001 From: ITKJuhoon <59675404+ITKJuhoon@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:10:12 -0700 Subject: [PATCH 2/2] updated reports formatting based on feedback --- .../CAPS Reports/ActiveProjectsTimeline.rdl | 73 +++++++-------- ...ailed K-12_School Facility Utilization.rdl | 90 +++++++++++++------ 2 files changed, 101 insertions(+), 62 deletions(-) diff --git a/CAPS Reports/CAPS Reports/ActiveProjectsTimeline.rdl b/CAPS Reports/CAPS Reports/ActiveProjectsTimeline.rdl index da88bcb..c727eb2 100644 --- a/CAPS Reports/CAPS Reports/ActiveProjectsTimeline.rdl +++ b/CAPS Reports/CAPS Reports/ActiveProjectsTimeline.rdl @@ -849,7 +849,6 @@ 2pt - true @@ -1563,13 +1562,13 @@ ReportItems!milestone_name.Value = "CPRL", Arial =IIf(IsNothing(Fields!caps_originaldate.Value), "Black", - IIf(Fields!caps_originaldate.Value < Globals!ExecutionTime, - IIf(Fields!caps_completeValue.Value = "1", - "White", - "White"), - IIf(Fields!caps_completeValue.Value = "1", - "Black", - "Black"))) + IIf(Fields!caps_originaldate.Value < Globals!ExecutionTime, + IIf(Fields!caps_completeValue.Value = "1", + "White", + "White"), + IIf(Fields!caps_completeValue.Value = "1", + "Black", + "Black"))) @@ -1584,13 +1583,13 @@ ReportItems!milestone_name.Value = "CPRL", =IIf(IsNothing(Fields!caps_originaldate.Value), "White", - IIf(Fields!caps_originaldate.Value < Globals!ExecutionTime, - IIf(Fields!caps_completeValue.Value = "1", - "Green", - "Red"), - IIf(Fields!caps_completeValue.Value = "1", - "#FFCC99", - "White"))) + IIf(Fields!caps_originaldate.Value < Globals!ExecutionTime, + IIf(Fields!caps_completeValue.Value = "1", + "Green", + "Red"), + IIf(Fields!caps_completeValue.Value = "1", + "#FFCC99", + "White"))) Middle 2pt 2pt @@ -1612,15 +1611,17 @@ ReportItems!milestone_name.Value = "CPRL", =iif(isnothing(Fields!caps_expectedactualdate.Value), "", Format(Cdate(Fields!caps_expectedactualdate.Value), "MMM-yy")) @@ -1633,15 +1634,15 @@ ReportItems!milestone_name.Value = "CPRL", LightGrey - =IIf(IsNothing(Fields!caps_originaldate.Value), + =IIf(IsNothing(Fields!caps_expectedactualdateValue.Value), "White", - IIf(Fields!caps_originaldate.Value < Globals!ExecutionTime, - IIf(Fields!caps_completeValue.Value = "1", - "Green", - "Red"), - IIf(Fields!caps_completeValue.Value = "1", - "#FFCC99", - "White"))) + IIf(Fields!caps_expectedactualdateValue.Value < Globals!ExecutionTime, + IIf(Fields!caps_completeValue.Value = "1", + "Green", + "Red"), + IIf(Fields!caps_completeValue.Value = "1", + "#FFCC99", + "White"))) Middle 2pt 2pt @@ -1649,6 +1650,7 @@ ReportItems!milestone_name.Value = "CPRL", 2pt + true @@ -2286,7 +2288,7 @@ lookup(Fields!caps_projecttracker.Value, Fields!caps_projecttracker.Value, Field - ="• No Colour: No Original Date, or Original Date is in the future and Incomplete." + ="• No Colour: No Original Date/Actual Date, or Original Date/Actual Date is in the future and Incomplete." HTML - LightGrey - 1pt + Black + 1.5pt LightGrey 1pt - LightGrey - 1pt + Black + 1.5pt LightGrey @@ -923,6 +923,10 @@ Black + + Black + 1.5pt + #234075 2pt 2pt @@ -1457,6 +1461,9 @@ LightGrey + + LightGrey + Black 1.5pt @@ -1543,6 +1550,12 @@ LightGrey + + LightGrey + + + LightGrey + Black 1.5pt @@ -1737,8 +1750,7 @@ - Black - 1.5pt + LightGrey Black @@ -1841,8 +1853,7 @@ - Black - 1.5pt + LightGrey Black @@ -2262,7 +2273,7 @@ - Black + LightGrey Black @@ -2352,6 +2363,9 @@ LightGrey + + LightGrey + Black @@ -2395,6 +2409,9 @@ LightGrey + + LightGrey + Black 1.5pt @@ -2437,6 +2454,9 @@ LightGrey + + LightGrey + Black @@ -2479,6 +2499,9 @@ LightGrey + + LightGrey + Black 1.5pt @@ -2520,6 +2543,9 @@ LightGrey + + LightGrey + Black 1.5pt @@ -2568,6 +2594,7 @@ IIF(ReportItems!SD_DesignUtilization.Value >= 1, "Red", "Black")) LightGrey + Black 1.5pt @@ -2613,9 +2640,8 @@ IIF(ReportItems!SD_DesignUtilization.Value >= 1, "Red", "Black")) - Black + LightGrey - 1.5pt Black @@ -2664,8 +2690,7 @@ IIF(ReportItems!SD_OperatingUtilization.Value >= 1, "Red", "Black")) - Black - 1.5pt + LightGrey Black @@ -2714,9 +2739,8 @@ IIF(ReportItems!SD_OperatingUtilization.Value >= 1, "Red", "Black")) - Black + LightGrey - 1.5pt Black @@ -2766,8 +2790,7 @@ IIF(ReportItems!caps_total_operatingutilization_district1.Value >= 1, "Red", - Black - 1.5pt + LightGrey Black @@ -2876,6 +2899,9 @@ IIF(ReportItems!caps_total_operatingutilization_district1.Value >= 1, "Red", Black + + LightGrey + Black @@ -2979,6 +3005,9 @@ IIF(ReportItems!SDEnrolment_caps_totalenrolmentValue.Value = 0, "DimGray","White LightGrey + + LightGrey + Black @@ -3082,6 +3111,9 @@ IIF(ReportItems!SDEnrolment_caps_totalenrolmentValue.Value = 0, "DimGray","White LightGrey + + LightGrey + Black @@ -3241,8 +3273,7 @@ IIF(ReportItems!SDEnrolment_caps_totalenrolmentValue.Value = 0, "DimGray","White - Black - 1.5pt + LightGrey Black @@ -3298,6 +3329,9 @@ IIF(ReportItems!SDEnrolment_caps_totalenrolmentValue.Value / ReportItems!caps_to + + LightGrey + 1.5pt @@ -3584,7 +3618,8 @@ IIF(ReportItems!SDEnrolment_caps_totalenrolmentValue.Value = 0, "DimGray","White - 1pt + Black + 1.5pt 1pt @@ -3593,7 +3628,8 @@ IIF(ReportItems!SDEnrolment_caps_totalenrolmentValue.Value = 0, "DimGray","White 1pt - 1pt + Black + 1.5pt #234075 2pt @@ -3697,7 +3733,8 @@ IIF(ReportItems!SDEnrolment_caps_totalenrolmentValue.Value = 0, "DimGray","White 1pt - 1pt + Black + 1.5pt =IIF(Fields!YEAR_statuscodeValue.Value = 1, "#e3a82b", "#234075") Middle @@ -3707,6 +3744,7 @@ IIF(ReportItems!SDEnrolment_caps_totalenrolmentValue.Value = 0, "DimGray","White 2pt + true @@ -3768,11 +3806,11 @@ IIF(ReportItems!SDEnrolment_caps_totalenrolmentValue.Value = 0, "DimGray","White Black - 1pt + 1.5pt Black - 1pt + 1.5pt #234075 Middle @@ -4041,7 +4079,7 @@ IIF(ReportItems!SDEnrolment_caps_totalenrolmentValue.Value = 0, "DimGray","White Black - 1pt + 1.5pt Black @@ -4056,7 +4094,7 @@ IIF(ReportItems!SDEnrolment_caps_totalenrolmentValue.Value = 0, "DimGray","White Black - 1pt + 1.5pt #234075 Middle