Skip to content

Commit

Permalink
Team Testing Fixes: Shared Components (QBO/Sage300/MSD) (#455)
Browse files Browse the repository at this point in the history
* height of mapping search

* Fixed width

* fix skip expense service payloads
  • Loading branch information
anishfyle authored Jan 18, 2024
1 parent 4d3e50e commit 868a01f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/app/core/models/db/expense-group.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ export type SkipExportParam = {
limit: number;
offset: number;
org_id: string;
start_date?: string;
end_date?: string;
updated_at__gte?: string;
updated_at__lte?: string;
}
4 changes: 2 additions & 2 deletions src/app/core/services/common/export-log.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ export class ExportLogService {
if (selectedDateFilter) {
const startDate = selectedDateFilter.startDate.toLocaleDateString().split('/');
const endDate = selectedDateFilter.endDate.toLocaleDateString().split('/');
params.start_date = `${startDate[2]}-${startDate[1]}-${startDate[0]}T00:00:00`;
params.end_date = `${endDate[2]}-${endDate[1]}-${endDate[0]}T23:59:59`;
params.updated_at__gte = `${startDate[2]}-${startDate[1]}-${startDate[0]}T00:00:00`;
params.updated_at__lte = `${endDate[2]}-${endDate[1]}-${endDate[0]}T23:59:59`;
}
return this.apiService.get(`/workspaces/${workspaceId}/fyle/expenses/`, params);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ <h5 class="!tw-text-faded-text-color tw-text-12-px tw-pt-10-px !tw-font-400 !tw-
<p-dialog [dismissableMask]="true" [modal]="true" [(visible)]="isAccountingErrorDialogVisible" [position]="'top-right'" [style]="{ width: 'fit-content', height: '100vh' }" [maximizable]="false" [draggable]="false" [resizable]="false" [breakpoints]="{ '960px': '75vw' }">
<p-header>
<p class="tw-line-height-20">{{appName}} Error</p>
<h3 class="sub-header">{{errorDetail}}</h3>
<h3 class="dialog-sub-header">{{errorDetail}}</h3>
</p-header>
<app-dashboard-accounting-error-dialog [isLoading]="isLoading" [errorExpenses]="errorExpenses"></app-dashboard-accounting-error-dialog>
</p-dialog>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
@apply tw-flex tw-items-start tw-justify-between;
}

.sub-header {
@apply tw-text-14-px tw-mt-8-px tw-font-400 tw-text-faded-text-color;
}

:host ::ng-deep .p-dialog {
@apply tw-max-h-full tw-m-0 #{!important};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</div>
</div>
<div *ngIf="isSearchBoxActive">
<div class="p-inputgroup" (focusout)="onFocusOut($event)">
<div class="p-inputgroup !tw-h-40-px" (focusout)="onFocusOut($event)">
<span class="p-inputgroup-addon !tw-bg-white !tw-border-r-0 !tw-px-0">
<i class="pi pi-search"></i>
</span>
Expand All @@ -18,7 +18,7 @@
</div>
</div>
<div>
<div class="tw-pl-16-px">
<div class="tw-pl-16-px !tw-h-40-px">
<p class="tw-text-12-px tw-text-faded-text-color tw-text-500 tw-pb-8-px">Status</p>
</div>
<div class="tw-border-l tw-border-l-separator tw-pl-16-px">
Expand Down

0 comments on commit 868a01f

Please sign in to comment.