C1: QA Fixes - 3 | Dropdown | Multiselect | Toggle | BG | Toast | Chi…

…ps | LV | Border (#531) * C1: QA Fixes - 3 * fix lint * other fixes * dropdown * dropdown with search * fix lint * C1 dropdown qa fix (#544) white labeling gC1 * C1 qa multiselect | toggle | bg | toast | chips | lv | border (#536) * C1: QA Fixes - 4 | Multiselect * fix bg * c1: QA Fixes - Toggle (#538) * C1 qa toast (#540) * c1: QA Fixes - Toggle * c1: Toast * c1: QA fixes | Chips (#542) * fix travelperk btn * c1: QA fixes | list views (#548) * C1 qa borders (#549) * c1: QA fixes | list views * c1: QA fixes - Border * c1: QA fixes - Calendar (#551) * C1: QA Fixes - 4 | Multiselect * fix bg * c1: QA Fixes - Toggle (#538) * C1 qa toast (#540) * c1: QA Fixes - Toggle * c1: Toast * c1: QA fixes | Chips (#542) * fix travelperk btn * c1: QA fixes | list views * c1: QA fixes - Border * c1: QA fixes | list views (#548) * C1 qa borders (#549) * c1: QA fixes | list views * c1: QA fixes - Border * c1: QA fixes - Calendar * fix search * comment out stuffs * fix icon * few more * fix qbd btn * fix mapping card * fix bamboo * intacct search, calendar --------- Co-authored-by: Dhaarani <[email protected]>
fylein · Feb 14, 2024 · 58af0e2 · 58af0e2
1 parent 2207319
commit 58af0e2
Show file tree

Hide file tree

Showing 93 changed files with 608 additions and 486 deletions.
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -2,14 +2,14 @@
 </router-outlet>
 <p-toast position="bottom-center" [baseZIndex]="5000">
     <ng-template let-message pTemplate="message">
-        <div class="tw-flex tw-justify-between tw-items-center tw-h-44-px tw-text-14-px tw-px-10-px" [ngClass]="message.severity === 'success' ? 'tw-bg-success-toast' : 'tw-bg-alert-toast'">
+        <div class="tw-flex tw-justify-between tw-items-center tw-h-44-px tw-text-14-px tw-p-12-px" [ngClass]="message.severity === 'success' ? 'tw-bg-toast-success-bg' : 'tw-bg-toast-error-bg'">
             <div class="tw-inline-flex tw-items-center">
-                <app-svg-icon *ngIf="message.severity === 'success'" [svgSource]="'check-circle-outline-medium'" [width]="'20px'" [height]="'20px'" [styleClasses]="'tw-text-white tw-pl-14-px tw-pr-10-px tw-pt-2-px'"></app-svg-icon>
-                <app-svg-icon *ngIf="message.severity !== 'success'" [svgSource]="'warning-outline'" [width]="'20px'" [height]="'20px'" [styleClasses]="'tw-text-white tw-pl-14-px tw-pr-10-px tw-pt-2-px'"></app-svg-icon>
-                <span class="tw-pl-10-px">{{ message.summary }}</span>
+                <app-svg-icon *ngIf="message.severity === 'success'" [svgSource]="'check-circle-outline-medium'" [c1SvgSource]="'grv-checkmark-encircled-success-medium'" [width]="'20px'" [height]="'20px'" [styleClasses]="'tw-text-alerts-success-icon-color'" [isTextColorAllowed]="true"></app-svg-icon>
+                <app-svg-icon *ngIf="message.severity !== 'success'" [svgSource]="'warning-outline-medium'" [c1SvgSource]="'grv-caution-triangle-critical-medium'" [width]="'20px'" [height]="'20px'" [styleClasses]="'tw-text-toast-text-color'" [isTextColorAllowed]="true"></app-svg-icon>
+                <span class="tw-text-toast-text-color tw-pl-8-px">{{ message.summary }}</span>
             </div>
             <div class="tw-inline-flex tw-items-center tw-cursor-pointer">
-                <app-svg-icon (iconClick)="closeToast()" [svgSource]="'cross-medium'" [width]="'16px'" [height]="'16px'" [styleClasses]="'tw-text-white'"></app-svg-icon>
+                <app-svg-icon (iconClick)="closeToast()" [svgSource]="'cross-medium'" [width]="'16px'" [height]="'16px'" [styleClasses]="'tw-text-toast-text-color'" [isTextColorAllowed]="true"></app-svg-icon>
             </div>
         </div>
     </ng-template>

diff --git a/.../business-central/business-central-configuration/business-central-export-setting.model.ts b/.../business-central/business-central-configuration/business-central-export-setting.model.ts
@@ -186,7 +186,8 @@ export class BusinessCentralExportSettingModel {
             reimbursableEmployeeMapping: new FormControl(exportSettings?.employee_field_mapping ? exportSettings?.employee_field_mapping : null, Validators.required),
             journalEntryNamePreference: new FormControl(exportSettings?.name_in_journal_entry ? exportSettings?.name_in_journal_entry : null),
             autoMapEmployee: new FormControl(exportSettings?.auto_map_employees ? exportSettings?.auto_map_employees : null),
-            defaultVendorName: new FormControl(exportSettings?.default_vendor_name ? findObjectByDestinationId(destinationAttribute.VENDOR, exportSettings?.default_vendor_id) : null)
+            defaultVendorName: new FormControl(exportSettings?.default_vendor_name ? findObjectByDestinationId(destinationAttribute.VENDOR, exportSettings?.default_vendor_id) : null),
+            searchOption: new FormControl('')
         });
     }
 

diff --git a/src/app/core/models/qbo/qbo-configuration/qbo-export-setting.model.ts b/src/app/core/models/qbo/qbo-configuration/qbo-export-setting.model.ts
@@ -248,7 +248,8 @@ export class QBOExportSettingModel extends ExportSettingModel {
       defaultCreditCardVendor: new FormControl(exportSettings?.general_mappings?.default_ccc_vendor?.id ? exportSettings.general_mappings.default_ccc_vendor : null),
       qboExpenseAccount: new FormControl(exportSettings?.general_mappings?.qbo_expense_account?.id ? exportSettings.general_mappings.qbo_expense_account : null),
       defaultDebitCardAccount: new FormControl(exportSettings?.general_mappings?.default_debit_card_account?.id ? exportSettings.general_mappings.default_debit_card_account : null),
-      nameInJournalEntry: new FormControl(exportSettings?.workspace_general_settings.name_in_journal_entry ? exportSettings.workspace_general_settings.name_in_journal_entry : NameInJournalEntry.EMPLOYEE )
+      nameInJournalEntry: new FormControl(exportSettings?.workspace_general_settings.name_in_journal_entry ? exportSettings.workspace_general_settings.name_in_journal_entry : NameInJournalEntry.EMPLOYEE ),
+      searchOption: new FormControl('')
     });
   }
 

diff --git a/src/app/core/models/qbo/qbo-configuration/qbo-import-setting.model.ts b/src/app/core/models/qbo/qbo-configuration/qbo-import-setting.model.ts
@@ -67,7 +67,8 @@ export class QBOImportSettingModel extends ImportSettingsModel {
       importItems: new FormControl(importSettings?.workspace_general_settings.import_items ?? false),
       taxCode: new FormControl(importSettings?.workspace_general_settings.import_tax_codes ?? false),
       importVendorsAsMerchants: new FormControl(importSettings?.workspace_general_settings.import_vendors_as_merchants ?? false),
-      defaultTaxCode: new FormControl(importSettings?.general_mappings?.default_tax_code?.id ? importSettings.general_mappings.default_tax_code : null)
+      defaultTaxCode: new FormControl(importSettings?.general_mappings?.default_tax_code?.id ? importSettings.general_mappings.default_tax_code : null),
+      searchOption: new FormControl('')
     });
   }
 

diff --git a/src/app/core/models/sage300/sage300-configuration/sage300-export-setting.model.ts b/src/app/core/models/sage300/sage300-configuration/sage300-export-setting.model.ts
@@ -67,7 +67,8 @@ export class ExportSettingModel {
       defaultCreditCardCCCAccountName: new FormControl(exportSettings?.default_ccc_credit_card_account_name ? findObjectByDestinationId(destinationAttribute.ACCOUNT, exportSettings?.default_ccc_credit_card_account_id) : null),
       defaultVendorName: new FormControl(exportSettings?.default_vendor_name ? findObjectByDestinationId(destinationAttribute.VENDOR, exportSettings?.default_vendor_id) : null),
       defaultDebitCardAccountName: new FormControl(exportSettings?.default_debit_card_account_name ? findObjectByDestinationId(destinationAttribute.ACCOUNT, exportSettings?.default_debit_card_account_id) : null),
-      defaultJobName: new FormControl(exportSettings?.default_job_name ? findObjectByDestinationId(destinationAttribute.JOB, exportSettings?.default_job_id) : null)
+      defaultJobName: new FormControl(exportSettings?.default_job_name ? findObjectByDestinationId(destinationAttribute.JOB, exportSettings?.default_job_id) : null),
+      searchOption: new FormControl('')
     });
   }
 

diff --git a/src/app/integrations/bamboo-hr/configuration/configuration.component.html b/src/app/integrations/bamboo-hr/configuration/configuration.component.html
@@ -47,14 +47,18 @@
                                 </ng-template>
                                 <ng-template pTemplate="filter" let-options="options">
                                     <div *ngIf="emails.length" class="p-inputgroup">
-                                        <div class="p-input-icon-left">
-                                            <app-svg-icon [svgSource]="'search-medium'" [height]="'18px'" [width]="'18px'"></app-svg-icon>
+                                        <div class="p-input-icon-left p-input-icon-right">
+                                            <i>
+                                                <app-svg-icon [svgSource]="'search-medium'" [height]="'18px'" [width]="'18px'"></app-svg-icon>
+                                            </i>
                                             <input type="text" class="!tw-h-32-px !tw-w-300-px" (keyup)="options.filter($event)"
                                                 pInputText placeholder="Search by Name / Email" formControlName="search" />
-                                            <app-svg-icon [svgSource]="'cross'" [width]="'24px'" [height]="'24px'"
-                                                [styleClasses]="'tw-text-faded-text-color tw-absolute tw-top-10-px tw-right-12-px tw-cursor-pointer'"
-                                                (iconClick)="clearSearch(options)">
-                                            </app-svg-icon>
+                                            <i>
+                                                <app-svg-icon [svgSource]="'cross-medium'" [width]="'16px'" [height]="'16px'"
+                                                    [styleClasses]="'tw-text-faded-text-color tw-cursor-pointer'"
+                                                    (iconClick)="clearSearch(options)">
+                                                </app-svg-icon>
+                                            </i>
                                         </div>
                                     </div>
                                 </ng-template>

diff --git a/...og/business-central-complete-export-log/business-central-complete-export-log.component.ts b/...og/business-central-complete-export-log/business-central-complete-export-log.component.ts
@@ -62,9 +62,7 @@ export class BusinessCentralCompleteExportLogComponent implements OnInit {
     this.windowService.openInNewTab(AccountingExportModel.getFyleExpenseUrl(expenseId));
   }
 
-  public handleSimpleSearch(event: any) {
-    const query = event.target.value.toLowerCase();
-
+  public handleSimpleSearch(query: string) {
     this.filteredAccountingExports = this.accountingExports.filter((group: AccountingExportList) => {
       return AccountingExportModel.getfilteredAccountingExports(query, group);
     });

diff --git a/...-log/business-central-skipped-export-log/business-central-skipped-export-log.component.ts b/...-log/business-central-skipped-export-log/business-central-skipped-export-log.component.ts
@@ -45,9 +45,7 @@ export class BusinessCentralSkippedExportLogComponent implements OnInit {
     private paginatorService: PaginatorService
   ) { }
 
-  public handleSimpleSearch(event: any) {
-    const query = event.target.value.toLowerCase();
-
+  public handleSimpleSearch(query: string) {
     this.filteredExpenses = this.expenses.filter((group: SkipExportList) => {
       return SkippedAccountingExportModel.getfilteredSkippedAccountingExports(query, group);
     });

diff --git a/...s/intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.ts b/...s/intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.ts
@@ -202,7 +202,8 @@ export class IntacctAdvancedSettingsComponent implements OnInit {
       defaultItems: [findObjectByDestinationId(this.sageIntacctDefaultItem, this.advancedSettings.general_mappings.default_item.id)],
       defaultPaymentAccount: [findObjectByDestinationId(this.sageIntacctPaymentAccount, this.advancedSettings.general_mappings.payment_account.id)],
       useEmployeeLocation: [this.advancedSettings.general_mappings.use_intacct_employee_locations ? this.advancedSettings.general_mappings.use_intacct_employee_locations : null],
-      useEmployeeDepartment: [this.advancedSettings.general_mappings.use_intacct_employee_departments ? this.advancedSettings.general_mappings.use_intacct_employee_departments : null]
+      useEmployeeDepartment: [this.advancedSettings.general_mappings.use_intacct_employee_departments ? this.advancedSettings.general_mappings.use_intacct_employee_departments : null],
+      searchOption: ['']
     });
     this.createAutoSyncPaymentsWatcher();
     this.createMemoStructureWatcher();

diff --git a/...ons/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html b/...ons/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html
@@ -51,6 +51,7 @@
                                 [iconPath]="'list'"
                                 [placeholder]="'Select GL account'"
                                 [formControllerName]="'glAccount'"
+                                [isAdvanceSearchEnabled]="true"
                                 (searchOptionsDropdown)="searchOptionsDropdown($event)"></app-configuration-select-field>
                             </div>
                             <div *ngIf="exportSettingsForm.value.reimbursableExportType===IntacctReimbursableExpensesObject.EXPENSE_REPORT">
@@ -66,6 +67,7 @@
                                 [iconPath]="'list'"
                                 [placeholder]="'Select expense payment type'"
                                 [formControllerName]="'reimbursableExpensePaymentType'"
+                                [isAdvanceSearchEnabled]="true"
                                 (searchOptionsDropdown)="searchOptionsDropdown($event)"></app-configuration-select-field>
                             </div>
                     </div>
@@ -160,6 +162,7 @@
                             [iconPath]="'list'"
                             [placeholder]="'Select expense payment type'"
                             [formControllerName]="'cccExpensePaymentType'"
+                            [isAdvanceSearchEnabled]="true"
                             (searchOptionsDropdown)="searchOptionsDropdown($event)"></app-configuration-select-field>
                         </div>
                         <div *ngIf="exportSettingsForm.value.cccExportType===CorporateCreditCardExpensesObject.BILL">
@@ -175,6 +178,7 @@
                             [iconPath]="'list'"
                             [placeholder]="'Select credit card vendor'"
                             [formControllerName]="'creditCardVendor'"
+                            [isAdvanceSearchEnabled]="true"
                             (searchOptionsDropdown)="searchOptionsDropdown($event)"></app-configuration-select-field>
                         </div>
                         <div *ngIf="exportSettingsForm.value.cccExportType===CorporateCreditCardExpensesObject.JOURNAL_ENTRY">
@@ -190,6 +194,7 @@
                             [iconPath]="'list'"
                             [placeholder]="'Select GL account'"
                             [formControllerName]="'creditCard'"
+                            [isAdvanceSearchEnabled]="true"
                             (searchOptionsDropdown)="searchOptionsDropdown($event)"></app-configuration-select-field>
                         </div>
                         <div *ngIf="exportSettingsForm.value.cccExportType === CorporateCreditCardExpensesObject.JOURNAL_ENTRY">
@@ -213,6 +218,7 @@
                             [iconPath]="'list'"
                             [placeholder]="'Select Charge Corporate Card'"
                             [formControllerName]="'chargeCard'"
+                            [isAdvanceSearchEnabled]="true"
                             (searchOptionsDropdown)="searchOptionsDropdown($event)"></app-configuration-select-field>
                         </div>
                     </div>

diff --git a/...ons/intacct/intacct-shared/intacct-import-settings/intacct-import-settings.component.scss b/...ons/intacct/intacct-shared/intacct-import-settings/intacct-import-settings.component.scss
@@ -85,32 +85,6 @@
       line-height: 18px;
     }
 
-    :host ::ng-deep .p-inputswitch.p-inputswitch-checked .p-inputswitch-slider::after {
-      content: 'Yes';
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      position: absolute;
-      left: 8px;
-      bottom: 0px;
-      font-size: 12px;
-      color: white;
-      font-weight: 500;
-  }
-
-  :host ::ng-deep .p-inputswitch:not(.p-inputswitch-checked) .p-inputswitch-slider::after {
-      content: 'No';
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      position: absolute;
-      left: 24px;
-      bottom: 0px;
-      font-size: 12px;
-      color: white;
-      font-weight: 500;
-  }
-
   .add-button-container {
     display: flex;
     align-items: center;

diff --git a/src/app/integrations/intacct/main/dashboard/dashboard.component.scss b/src/app/integrations/intacct/main/dashboard/dashboard.component.scss
@@ -47,18 +47,6 @@
     @apply tw-w-200-px tw-border-0 #{!important};
 }
 
-:host ::ng-deep .p-datatable .p-datatable-tbody > tr > td {
-    @apply tw-text-sub-text-color tw-text-14-px tw-font-400 tw-py-14-px tw-px-22-px tw-border-t tw-border-b-0 tw-border-t-box-color  #{!important};
-}
-
-:host ::ng-deep .p-datatable .p-datatable-thead > tr > th {
-    @apply tw-text-text-primary tw-text-12-px tw-font-500 tw-py-12-px tw-px-22-px tw-border tw-border-box-color tw-bg-disabled-bg-color #{!important}
-}
-
-:host ::ng-deep .p-datatable .p-datatable-tbody > tr > td > button {
-    @apply tw-pl-48-px #{!important};
-}
-
 :host ::ng-deep .p-progressbar {
     @apply tw-h-1.5 tw-bg-progress-bar-bg #{!important};
 }

diff --git a/...grations/intacct/main/export-log/completed-export-log/completed-export-log.component.html b/...grations/intacct/main/export-log/completed-export-log/completed-export-log.component.html
@@ -7,7 +7,7 @@
         <div [formGroup]="exportLogForm" class="tw-flex tw-items-center tw-p-24-px">
 
             <span class="custom-search-field" [ngStyle]="{ 'border-color': isSearchFocused ? 'black' : '#ccc' }">
-                <app-svg-icon [svgSource]="'search-medium'" [width]="'18px'" [height]="'18px'"></app-svg-icon>
+                <app-svg-icon [svgSource]="'search-medium'" [width]="'18px'" [height]="'18px'" [styleClasses]="'tw-text-icon-muted tw-pr-8-px'"></app-svg-icon>
                 <input class="tw-pb-1 tw-pt-1 tw-text-14-px" type="text" (input)="filterTable($event)" (focus)="isSearchFocused = true" (blur)="isSearchFocused = false" placeholder="Search by Employee Name or Expense ID" />
             </span>
             <div class="tw-flex tw-mr-4"></div>
@@ -39,8 +39,8 @@
                         <div>
                             <p-calendar (click)="showCalendar($event)" placeholder="Custom dates" formControlName="start" (onClose)="getDates()" [touchUI]="isCalendarVisible" *ngIf="date.dateRange === presentDate" selectionMode="range" [readonlyInput]="true" inputId="range"></p-calendar>
                             <p class="tw-text-sub-text-color tw-text-14-px" [ngClass]="{'!tw-text-mandatory-field-color' : exportLogForm.controls.dateRange.value === date }" *ngIf="date.dateRange !== presentDate">{{ date.dateRange | titlecase | snakeCaseToSpaceCase }}</p>
-                            <p class="tw-text-sub-text-color tw-text-12-px" *ngIf="date.dateRange !== presentDate && date.dateRange !== 'Today'">{{date.startDate | date : 'MMM dd, yyyy'}} - {{date.endDate | date : 'MMM dd, yyyy'}}</p>
-                            <p class="tw-text-sub-text-color tw-text-12-px" *ngIf="date.dateRange === 'Today'">{{date.startDate | date : 'MMM dd, yyyy'}}</p>
+                            <!-- <p class="tw-text-sub-text-color tw-text-12-px" *ngIf="date.dateRange !== presentDate && date.dateRange !== 'Today'">{{date.startDate | date : 'MMM dd, yyyy'}} - {{date.endDate | date : 'MMM dd, yyyy'}}</p>
+                            <p class="tw-text-sub-text-color tw-text-12-px" *ngIf="date.dateRange === 'Today'">{{date.startDate | date : 'MMM dd, yyyy'}}</p> -->
                         </div>
                     </ng-template> 
                 </p-dropdown>

diff --git a/...grations/intacct/main/export-log/completed-export-log/completed-export-log.component.scss b/...grations/intacct/main/export-log/completed-export-log/completed-export-log.component.scss
@@ -35,18 +35,6 @@ input.custom-focus:focus {
     @apply tw-w-200-px tw-border-0 #{!important};
 }
 
-:host ::ng-deep .p-datatable .p-datatable-tbody > tr > td {
-    @apply tw-text-sub-text-color tw-text-14-px tw-font-400 tw-py-14-px tw-px-22-px tw-border-t tw-border-b-0 tw-border-t-box-color  #{!important};
-}
-
-:host ::ng-deep .p-datatable .p-datatable-thead > tr > th {
-    @apply tw-text-text-primary tw-text-12-px tw-font-500 tw-py-12-px tw-px-22-px tw-border tw-border-box-color tw-bg-disabled-bg-color #{!important}
-}
-
-:host ::ng-deep .p-datatable .p-datatable-tbody > tr > td > button {
-    @apply tw-pl-48-px #{!important};
-}
-
 :host ::ng-deep .p-progressbar {
     @apply tw-h-1.5 tw-bg-progress-bar-bg #{!important};
 }

diff --git a/src/app/integrations/intacct/main/export-log/export-log.component.scss b/src/app/integrations/intacct/main/export-log/export-log.component.scss
@@ -29,18 +29,6 @@
     @apply tw-w-200-px tw-border-0 #{!important};
 }
 
-:host ::ng-deep .p-datatable .p-datatable-tbody > tr > td {
-    @apply tw-text-sub-text-color tw-text-14-px tw-font-400 tw-py-14-px tw-px-22-px tw-border-t tw-border-b-0 tw-border-t-box-color  #{!important};
-}
-
-:host ::ng-deep .p-datatable .p-datatable-thead > tr > th {
-    @apply tw-text-text-primary tw-text-12-px tw-font-500 tw-py-12-px tw-px-22-px tw-border tw-border-box-color tw-bg-disabled-bg-color #{!important}
-}
-
-:host ::ng-deep .p-datatable .p-datatable-tbody > tr > td > button {
-    @apply tw-pl-48-px #{!important};
-}
-
 :host ::ng-deep .p-progressbar {
     @apply tw-h-1.5 tw-bg-progress-bar-bg #{!important};
 }