fix: fix button padding issue and change header references for reques…

…t messages
udsm-dhis2-lab · Dec 15, 2023 · ecf30e3 · ecf30e3
1 parent 6e0b174
commit ecf30e3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/...pages/reporting-tools-assignment/components/facilities-list/facilities-list.component.css b/...pages/reporting-tools-assignment/components/facilities-list/facilities-list.component.css
@@ -17,3 +17,7 @@
   border-radius: 8px;
   background-color: transparent;
 }
+
+::ng-deep .mdc-button {
+  padding: 0 8px 0 8px !important;
+}
diff --git a/...pages/user-accounts/components/request-user-accounts/request-user-accounts.component.html b/...pages/user-accounts/components/request-user-accounts/request-user-accounts.component.html
@@ -185,7 +185,7 @@
         class="ml-2"
         (click)="onNext($event)"
       >
-        {{ 'Next' | translate }}
+        {{ 'Add' | translate }}
       </button>
       <button
         *ngIf="!readyToSave"

diff --git a/...p/pages/user-accounts/components/request-user-accounts/request-user-accounts.component.ts b/...p/pages/user-accounts/components/request-user-accounts/request-user-accounts.component.ts
@@ -296,7 +296,7 @@ export class RequestUserAccountsComponent implements OnInit {
                   );
                 })
                 .join('\n')} `,
-              subject: 'UA' + Date.now().toString() + '- MAOMBI YA ACCOUNT',
+              subject: 'UA' + Date.now().toString() + '- ACCOUNT REQUEST',
             },
             replyMessage: 'to be constructed',
             payload: this.formDataToStoreLocally?.map((data, index) => {

diff --git a/src/app/pages/user-accounts/components/users-list/users-list.component.ts b/src/app/pages/user-accounts/components/users-list/users-list.component.ts
@@ -104,7 +104,7 @@ export class UsersListComponent implements OnInit {
               }: \n\n  Username: ${user?.userCredentials?.username} \n Names: ${
                 user?.name
               } \n Email: ${user?.email ? user?.email : ''}`,
-              subject: 'UA' + Date.now().toString() + '- MAOMBI YA ACCOUNT',
+              subject: 'UA' + Date.now().toString() + '- ACCOUNT REQUEST',
             },
             replyMessage: `Account ${user?.userCredentials?.username} for ${
               user?.name

diff --git a/src/app/shared/helpers/construct-message.helper.ts b/src/app/shared/helpers/construct-message.helper.ts
@@ -104,7 +104,7 @@ export function constructMessageForFacilityAssignment(
       ' - ' +
       (keywordsKeys && keywordsKeys['messageRequestHeader']
         ? keywordsKeys['formRequestMessageHeaderKey']
-        : 'MAOMBI YA FOMU'),
+        : 'FORM REQUEST'),
     message,
   };
 }
@@ -160,7 +160,7 @@ export function constructMessageForDataSetAssignment(
       ' - ' +
       (keywordsKeys && keywordsKeys['messageRequestHeader']
         ? keywordsKeys['formRequestMessageHeaderKey']
-        : 'MAOMBI YA FOMU'),
+        : 'FORM REQUEST'),
     message,
   };
 }