Merge pull request #1018 from bcgov/dev

Dev
bcgov · Jan 23, 2025 · 491d3dc · 491d3dc
2 parents cd62782 + 9e31fe3
commit 491d3dc
Show file tree

Hide file tree

Showing 6 changed files with 158 additions and 133 deletions.
diff --git a/...r/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CurrencyWidget/Default.js b/...r/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CurrencyWidget/Default.js
@@ -1,8 +1,13 @@
-(function () {   
+(function () {
     $('.custom-currency-input').maskMoney({
         thousands: ',',
         decimal: '.'
     }).maskMoney('mask');
-})();
 
+    $('.custom-currency-input').on('blur', function () {
+        if ($(this).val() === '' || $(this).val() === '0') {
+            $(this).val('0.00');
+        }
+    });
+})();
 
diff --git a/.../Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetInstanceWidget/Default.js b/.../Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetInstanceWidget/Default.js
@@ -1,3 +1,12 @@
-$(function () {
-    $('.unity-currency-input').maskMoney();
-});
+(function () {
+    $('.custom-currency-input').maskMoney({
+        thousands: ',',
+        decimal: '.'
+    }).maskMoney('mask');
+
+    $('.custom-currency-input').on('blur', function () {
+        if ($(this).val() === '' || $(this).val() === '0') {
+            $(this).val('0.00');
+        }
+    });
+})();
diff --git a/...ity.Payments/src/Unity.Payments.Web/Views/Shared/Components/SupplierInfo/SupplierInfo.css b/...ity.Payments/src/Unity.Payments.Web/Views/Shared/Components/SupplierInfo/SupplierInfo.css
@@ -8,4 +8,8 @@
     position:relative;
     padding-left: 10px;
     color: rgb(109, 109, 109);
+}
+
+#SiteInfoTable_wrapper .dt-buttons {
+    float: right;
 }
diff --git a/...nity.Payments/src/Unity.Payments.Web/Views/Shared/Components/SupplierInfo/SupplierInfo.js b/...nity.Payments/src/Unity.Payments.Web/Views/Shared/Components/SupplierInfo/SupplierInfo.js
@@ -5,7 +5,8 @@ $(function () {
     const UIElements = {
         navOrgInfoTab: $('#nav-organization-info-tab'),
         applicantId: $("#ApplicantId"),
-        siteId: $("#SiteId")
+        siteId: $("#SiteId"),
+        hasEditSupplier: $("#HasEditSupplierInfo")
     };
 
     function init() {
@@ -110,6 +111,7 @@ $(function () {
         return {
             title: l('ApplicantInfoView:ApplicantInfo.SiteInfo:SiteNumber'),
             data: 'number',
+            name: 'number',
             className: 'data-table-header',
             index: columnIndex
         }
@@ -138,6 +140,7 @@ $(function () {
         return {
             title: l('ApplicantInfoView:ApplicantInfo.SiteInfo:MailingAddress'),
             data: 'addressLine1',
+            name: 'addressLine1',
             className: 'data-table-header',
             render: function (data, type, full, meta) {
                 return nullToEmpty(full.addressLine1) + ' ' + nullToEmpty(full.addressLine2) + " " + nullToEmpty(full.addressLine3) + " " + nullToEmpty(full.city) + " " + nullToEmpty(full.province) + " " + nullToEmpty(full.postalCode);
@@ -149,6 +152,7 @@ $(function () {
     function getBankAccount(columnIndex) {
         return {
             title: 'Bank Account',
+            name: 'bankAccount',
             data: 'bankAccount',
             className: 'data-table-header',
             index: columnIndex
@@ -158,6 +162,7 @@ $(function () {
     function getStatus(columnIndex) {
         return {
             title: 'Status',
+            name: 'status',
             data: 'status',
             className: 'data-table-header',
             index: columnIndex
@@ -168,11 +173,13 @@ $(function () {
         return {
             title: 'Default',
             data: 'id',
+            name: 'id',
             className: 'data-table-header',
             sortable: false,
             render: function (data, type, full, meta) {
                 let checked = UIElements.siteId.val() == data ? 'checked' : '';
-                return `<input type="radio" class="site-radio" name="default-site" onclick="saveSiteDefault('${data}')" ${checked} />`;
+                let disabled = UIElements.hasEditSupplier.val() == 'False' ? 'disabled' : '';
+                return `<input type="radio" class="site-radio" name="default-site" onclick="saveSiteDefault('${data}')" ${checked} ${disabled}/>`;
             },
             index: columnIndex
         }

diff --git a/...ions/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml b/...ions/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
@@ -1,5 +1,7 @@
 @page "{@Model.ApplicationFormSubmissionId?}"
 @* #pragma warning disable S1128 *@
+@using Unity.Flex.Web.Views.Shared.Components.WorksheetInstanceWidget
+@using Unity.GrantManager.Flex
 @using Unity.GrantManager.Localization
 @using Unity.GrantManager.Settings
 @using Unity.GrantManager.Web.Views.Shared.Components.CommentsWidget;
@@ -113,6 +115,20 @@
                     <div class="w-100 px-2" id="assessmentResultWidget">
                         @await Component.InvokeAsync("AssessmentResults", new { applicationId = Model.ApplicationId, applicationFormVersionId = Model.ApplicationFormVersionId })
                     </div>
+                    @if (await FeatureChecker.IsEnabledAsync("Unity.Flex"))
+                    {
+                        <div id="assessmentResultsCustomWidget">
+                            @await Component.InvokeAsync(typeof(WorksheetInstanceWidget),
+                                     new
+                                     {
+                                         instanceCorrelationId = Model.ApplicationId,
+                                         instanceCorrelationProvider = CorrelationConsts.Application,
+                                         sheetCorrelationId = Model.ApplicationFormVersionId,
+                                         sheetCorrelationProvider = CorrelationConsts.FormVersion,
+                                         uiAnchor = FlexConsts.AssessmentInfoUiAnchor
+                                     })
+                        </div>
+                    }
                     <div class="w-100 px-2" id="assessmentMainView">
                         @await Component.InvokeAsync("ReviewList")
                     </div>