From d130a83bd4a384189a01b5f5aaedba55de068264 Mon Sep 17 00:00:00 2001 From: ahasani194 Date: Mon, 4 May 2026 21:30:05 +0330 Subject: [PATCH] update ux writing --- .../pos-display/pos-display.component.html | 2 +- .../consumer/constants/menuItems.const.ts | 2 +- .../accounts/views/single.component.html | 2 +- .../components/list.component.ts | 2 +- .../views/complexes/single.component.html | 2 +- .../views/single.component.html | 4 ++-- .../customers/components/list.component.html | 2 +- .../customers/constants/routes/index.ts | 2 +- .../customers/views/single.component.html | 4 ++-- .../partner/constants/menuItems.const.ts | 2 +- .../accounts/views/single.component.html | 2 +- .../components/accounts/list.component.ts | 6 +++--- .../businessActivities/list.component.ts | 8 +------- .../consumers/constants/routes/index.ts | 2 +- .../businessActivities/single.component.html | 4 ++-- .../views/complexes/single.component.html | 2 +- .../consumers/views/list.component.html | 2 +- .../modules/consumers/views/list.component.ts | 10 +++------- .../views/poses/single.component.html | 2 +- .../consumers/views/single.component.html | 7 +++---- .../customers/components/list.component.html | 2 +- .../customers/constants/routes/index.ts | 2 +- .../customers/views/single.component.html | 2 +- .../license-info-template.component.html | 3 ++- .../license-info-template.component.ts | 3 ++- .../licenses/components/list.component.html | 2 +- .../superAdmin/constants/menuItems.const.ts | 2 +- .../consumers/constants/routes/index.ts | 2 +- .../businessActivities/single.component.html | 2 +- .../views/complexes/single.component.html | 2 +- .../consumers/views/list.component.html | 2 +- .../views/poses/single.component.html | 2 +- .../consumers/views/single.component.html | 2 +- .../modules/guilds/views/single.component.html | 2 +- .../modules/licenses/views/list.component.html | 2 +- .../modules/licenses/views/list.component.ts | 1 - .../partners/views/single.component.html | 2 +- .../modules/users/views/single.component.html | 2 +- .../layout/default/app.sidebar.component.html | 2 +- .../page-data-list-grid-view.component.html | 6 +++--- .../page-data-list-table-view.component.html | 2 +- .../pageDataList/page-data-list.component.html | 18 ++++++++++-------- .../components/table-action-row.component.html | 2 +- .../components/table-action-row.component.ts | 3 ++- 44 files changed, 66 insertions(+), 73 deletions(-) diff --git a/src/app/components/pos-display/pos-display.component.html b/src/app/components/pos-display/pos-display.component.html index 28bee2f..2515489 100644 --- a/src/app/components/pos-display/pos-display.component.html +++ b/src/app/components/pos-display/pos-display.component.html @@ -6,7 +6,7 @@
-
+
@for (field of visibleFields(); track field) { @if (isFieldVisible(field)) { diff --git a/src/app/domains/consumer/constants/menuItems.const.ts b/src/app/domains/consumer/constants/menuItems.const.ts index ad36fe4..2d6eed7 100644 --- a/src/app/domains/consumer/constants/menuItems.const.ts +++ b/src/app/domains/consumer/constants/menuItems.const.ts @@ -23,7 +23,7 @@ export const CONSUMER_MENU_ITEMS = [ routerLink: ['/consumer/sale_invoices'], }, { - label: 'مشتریان', + label: 'مشتری‌ها', icon: 'pi pi-fw pi-home', routerLink: ['/consumer/customers'], }, diff --git a/src/app/domains/consumer/modules/accounts/views/single.component.html b/src/app/domains/consumer/modules/accounts/views/single.component.html index f08663e..321ebf4 100644 --- a/src/app/domains/consumer/modules/accounts/views/single.component.html +++ b/src/app/domains/consumer/modules/accounts/views/single.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/domains/consumer/modules/businessActivities/components/list.component.ts b/src/app/domains/consumer/modules/businessActivities/components/list.component.ts index 67e99ff..908c235 100644 --- a/src/app/domains/consumer/modules/businessActivities/components/list.component.ts +++ b/src/app/domains/consumer/modules/businessActivities/components/list.component.ts @@ -35,7 +35,7 @@ export class ConsumerBusinessActivityListComponent extends AbstractList
-
+
diff --git a/src/app/domains/consumer/modules/businessActivities/views/single.component.html b/src/app/domains/consumer/modules/businessActivities/views/single.component.html index d300f23..49ab86b 100644 --- a/src/app/domains/consumer/modules/businessActivities/views/single.component.html +++ b/src/app/domains/consumer/modules/businessActivities/views/single.component.html @@ -4,13 +4,13 @@ مدیریت کالاها
-
+
اطلاعات لایسنس -
+
diff --git a/src/app/domains/consumer/modules/customers/components/list.component.html b/src/app/domains/consumer/modules/customers/components/list.component.html index 916930c..b6a8d08 100644 --- a/src/app/domains/consumer/modules/customers/components/list.component.html +++ b/src/app/domains/consumer/modules/customers/components/list.component.html @@ -1,5 +1,5 @@ import('../../views/list.component').then((m) => m.ConsumerCustomersComponent), meta: { - title: 'مشتریان', + title: 'مشتری‌ها', pagePath: () => 'consumer/customers', }, }, diff --git a/src/app/domains/consumer/modules/customers/views/single.component.html b/src/app/domains/consumer/modules/customers/views/single.component.html index 03b6556..c4f30e7 100644 --- a/src/app/domains/consumer/modules/customers/views/single.component.html +++ b/src/app/domains/consumer/modules/customers/views/single.component.html @@ -6,14 +6,14 @@ >
@if (customer()?.type === "LEGAL") { -
+
} @else if (customer()?.type === "INDIVIDUAL") { -
+
diff --git a/src/app/domains/partner/constants/menuItems.const.ts b/src/app/domains/partner/constants/menuItems.const.ts index 4f3da20..31e4570 100644 --- a/src/app/domains/partner/constants/menuItems.const.ts +++ b/src/app/domains/partner/constants/menuItems.const.ts @@ -13,7 +13,7 @@ export const PARTNER_MENU_ITEMS = [ routerLink: ['/partner/accounts'], }, { - label: 'مشتریان', + label: 'مشتری‌ها', icon: 'pi pi-fw pi-home', routerLink: ['/partner/consumers'], }, diff --git a/src/app/domains/partner/modules/accounts/views/single.component.html b/src/app/domains/partner/modules/accounts/views/single.component.html index fcac674..76c7796 100644 --- a/src/app/domains/partner/modules/accounts/views/single.component.html +++ b/src/app/domains/partner/modules/accounts/views/single.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/domains/partner/modules/consumers/components/accounts/list.component.ts b/src/app/domains/partner/modules/consumers/components/accounts/list.component.ts index 3bd5e27..15e8a08 100644 --- a/src/app/domains/partner/modules/consumers/components/accounts/list.component.ts +++ b/src/app/domains/partner/modules/consumers/components/accounts/list.component.ts @@ -25,10 +25,10 @@ export class ConsumerAccountListComponent extends AbstractList = { path: 'consumers', loadComponent: () => import('../../views/list.component').then((m) => m.ConsumersComponent), meta: { - title: 'مشتریان', + title: 'مشتری‌ها', pagePath: () => '/partner/consumers', }, }, diff --git a/src/app/domains/partner/modules/consumers/views/businessActivities/single.component.html b/src/app/domains/partner/modules/consumers/views/businessActivities/single.component.html index fad7bc2..dca5370 100644 --- a/src/app/domains/partner/modules/consumers/views/businessActivities/single.component.html +++ b/src/app/domains/partner/modules/consumers/views/businessActivities/single.component.html @@ -1,10 +1,10 @@
- +
-
+
diff --git a/src/app/domains/partner/modules/consumers/views/complexes/single.component.html b/src/app/domains/partner/modules/consumers/views/complexes/single.component.html index fc23176..3de6b94 100644 --- a/src/app/domains/partner/modules/consumers/views/complexes/single.component.html +++ b/src/app/domains/partner/modules/consumers/views/complexes/single.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/domains/partner/modules/consumers/views/list.component.html b/src/app/domains/partner/modules/consumers/views/list.component.html index acd5a29..6f2d189 100644 --- a/src/app/domains/partner/modules/consumers/views/list.component.html +++ b/src/app/domains/partner/modules/consumers/views/list.component.html @@ -1,5 +1,5 @@ { private readonly service = inject(ConsumersService); @@ -25,9 +21,9 @@ export class ConsumersComponent extends AbstractList { override setColumns(): void { this.columns = [ - { field: 'id', header: 'شناسه', type: 'id' }, { field: 'name', header: 'نام' }, - { field: 'business_counts', header: 'تعداد فعالیت‌های اقتصادی فعال' }, + { field: 'type', header: 'نوع', type: 'nested', nestedOption: { path: 'type.translate' } }, + { field: 'business_counts', header: 'تعداد فعالیت‌ اقتصادی فعال' }, { field: 'created_at', diff --git a/src/app/domains/partner/modules/consumers/views/poses/single.component.html b/src/app/domains/partner/modules/consumers/views/poses/single.component.html index 432ee50..1b13fb1 100644 --- a/src/app/domains/partner/modules/consumers/views/poses/single.component.html +++ b/src/app/domains/partner/modules/consumers/views/poses/single.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/domains/partner/modules/consumers/views/single.component.html b/src/app/domains/partner/modules/consumers/views/single.component.html index ae01229..9011d07 100644 --- a/src/app/domains/partner/modules/consumers/views/single.component.html +++ b/src/app/domains/partner/modules/consumers/views/single.component.html @@ -2,23 +2,22 @@
-
+
- - @if (consumer()?.type?.value === "LEGAL") { } @else { } +
- + import('../../views/list.component').then((m) => m.PartnerCustomersComponent), meta: { - title: 'مشتریان', + title: 'مشتری‌ها', pagePath: () => 'partner/customers', }, }, diff --git a/src/app/domains/partner/modules/customers/views/single.component.html b/src/app/domains/partner/modules/customers/views/single.component.html index 14824d7..c36d41f 100644 --- a/src/app/domains/partner/modules/customers/views/single.component.html +++ b/src/app/domains/partner/modules/customers/views/single.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/domains/partner/modules/dashboard/components/licenseInfo/license-info-template.component.html b/src/app/domains/partner/modules/dashboard/components/licenseInfo/license-info-template.component.html index ce80359..683ff38 100644 --- a/src/app/domains/partner/modules/dashboard/components/licenseInfo/license-info-template.component.html +++ b/src/app/domains/partner/modules/dashboard/components/licenseInfo/license-info-template.component.html @@ -1,6 +1,7 @@ -
+
وضعیت {{ title }} +

diff --git a/src/app/domains/partner/modules/dashboard/components/licenseInfo/license-info-template.component.ts b/src/app/domains/partner/modules/dashboard/components/licenseInfo/license-info-template.component.ts index 53caa50..c67a9bc 100644 --- a/src/app/domains/partner/modules/dashboard/components/licenseInfo/license-info-template.component.ts +++ b/src/app/domains/partner/modules/dashboard/components/licenseInfo/license-info-template.component.ts @@ -1,10 +1,11 @@ import { Component, Input } from '@angular/core'; +import { Badge } from 'primeng/badge'; import { Card } from 'primeng/card'; @Component({ selector: 'partner-license-info-template', templateUrl: './license-info-template.component.html', - imports: [Card], + imports: [Card, Badge], }) export class PartnerLicenseInfoTemplateComponent { @Input({ required: true }) title!: string; diff --git a/src/app/domains/partner/modules/licenses/components/list.component.html b/src/app/domains/partner/modules/licenses/components/list.component.html index d279f77..adae212 100644 --- a/src/app/domains/partner/modules/licenses/components/list.component.html +++ b/src/app/domains/partner/modules/licenses/components/list.component.html @@ -1,5 +1,5 @@ = path: 'consumers', loadComponent: () => import('../../views/list.component').then((m) => m.ConsumersComponent), meta: { - title: 'مشتریان', + title: 'مشتری‌ها', pagePath: () => '/super_admin/consumers', }, }, diff --git a/src/app/domains/superAdmin/modules/consumers/views/businessActivities/single.component.html b/src/app/domains/superAdmin/modules/consumers/views/businessActivities/single.component.html index b987988..9361ee3 100644 --- a/src/app/domains/superAdmin/modules/consumers/views/businessActivities/single.component.html +++ b/src/app/domains/superAdmin/modules/consumers/views/businessActivities/single.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/domains/superAdmin/modules/consumers/views/complexes/single.component.html b/src/app/domains/superAdmin/modules/consumers/views/complexes/single.component.html index 1d2c588..99bb679 100644 --- a/src/app/domains/superAdmin/modules/consumers/views/complexes/single.component.html +++ b/src/app/domains/superAdmin/modules/consumers/views/complexes/single.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/domains/superAdmin/modules/consumers/views/list.component.html b/src/app/domains/superAdmin/modules/consumers/views/list.component.html index 56d43f6..05df5d0 100644 --- a/src/app/domains/superAdmin/modules/consumers/views/list.component.html +++ b/src/app/domains/superAdmin/modules/consumers/views/list.component.html @@ -1,5 +1,5 @@
-
+
diff --git a/src/app/domains/superAdmin/modules/consumers/views/single.component.html b/src/app/domains/superAdmin/modules/consumers/views/single.component.html index 13ca323..ad07b8b 100644 --- a/src/app/domains/superAdmin/modules/consumers/views/single.component.html +++ b/src/app/domains/superAdmin/modules/consumers/views/single.component.html @@ -2,7 +2,7 @@
-
+
diff --git a/src/app/domains/superAdmin/modules/guilds/views/single.component.html b/src/app/domains/superAdmin/modules/guilds/views/single.component.html index 40ffaa6..fb103b9 100644 --- a/src/app/domains/superAdmin/modules/guilds/views/single.component.html +++ b/src/app/domains/superAdmin/modules/guilds/views/single.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/domains/superAdmin/modules/licenses/views/list.component.html b/src/app/domains/superAdmin/modules/licenses/views/list.component.html index c6b966d..b2c69fc 100644 --- a/src/app/domains/superAdmin/modules/licenses/views/list.component.html +++ b/src/app/domains/superAdmin/modules/licenses/views/list.component.html @@ -1,5 +1,5 @@ { override setColumns(): void { this.columns = [ - { field: 'id', header: 'شناسه', type: 'id' }, { field: 'consumer', header: 'مشتری', diff --git a/src/app/domains/superAdmin/modules/partners/views/single.component.html b/src/app/domains/superAdmin/modules/partners/views/single.component.html index 711b988..73462ac 100644 --- a/src/app/domains/superAdmin/modules/partners/views/single.component.html +++ b/src/app/domains/superAdmin/modules/partners/views/single.component.html @@ -5,7 +5,7 @@ شارژ لایسنس‌
-
+
diff --git a/src/app/domains/superAdmin/modules/users/views/single.component.html b/src/app/domains/superAdmin/modules/users/views/single.component.html index 44706c9..669fae5 100644 --- a/src/app/domains/superAdmin/modules/users/views/single.component.html +++ b/src/app/domains/superAdmin/modules/users/views/single.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/layout/default/app.sidebar.component.html b/src/app/layout/default/app.sidebar.component.html index 5736742..1021575 100644 --- a/src/app/layout/default/app.sidebar.component.html +++ b/src/app/layout/default/app.sidebar.component.html @@ -4,7 +4,7 @@
- ارایه شده توسط (برند نرم‌افزار) + ارایه شده توسط (برند نرم‌افزار)
diff --git a/src/app/shared/components/pageDataList/page-data-list-grid-view.component.html b/src/app/shared/components/pageDataList/page-data-list-grid-view.component.html index 957d112..ec1e326 100644 --- a/src/app/shared/components/pageDataList/page-data-list-grid-view.component.html +++ b/src/app/shared/components/pageDataList/page-data-list-grid-view.component.html @@ -47,13 +47,13 @@
@if (showEdit) { - + } @if (showDelete) { - + } @if (showDetails) { - + }
} diff --git a/src/app/shared/components/pageDataList/page-data-list-table-view.component.html b/src/app/shared/components/pageDataList/page-data-list-table-view.component.html index eb4e656..cb3cbf2 100644 --- a/src/app/shared/components/pageDataList/page-data-list-table-view.component.html +++ b/src/app/shared/components/pageDataList/page-data-list-table-view.component.html @@ -13,7 +13,7 @@ [tableStyleClass]="!items.length && !loading ? 'h-full' : ''" > @if (captionBox) { - + } diff --git a/src/app/shared/components/pageDataList/page-data-list.component.html b/src/app/shared/components/pageDataList/page-data-list.component.html index 5c9ee17..85d3a3d 100644 --- a/src/app/shared/components/pageDataList/page-data-list.component.html +++ b/src/app/shared/components/pageDataList/page-data-list.component.html @@ -17,8 +17,8 @@ (onDelete)="remove($event)" (onDetails)="details($event)" > - @if (pageTitle || showAdd || filter || caption || showRefresh || moreActions) { - + + @if (pageTitle || showAdd || filter || caption || showRefresh || moreActions) {
{{ pageTitle }}
@@ -51,8 +51,8 @@ }
-
- } + } +
- @if (pageTitle || showAdd || filter || caption || showRefresh || moreActions) { - + + @if (pageTitle || showAdd || filter || caption || showRefresh || moreActions) {
{{ pageTitle }}
@@ -117,15 +117,17 @@ label="{{ addNewCtaLabel }}" icon="pi pi-plus" size="small" + class="max-sm:hidden" (click)="openAddForm()" > + }
}
- - } + } + } @if (showDetails) { - + } diff --git a/src/app/shared/components/table-action-row.component.ts b/src/app/shared/components/table-action-row.component.ts index 10145cd..6a3c6cb 100644 --- a/src/app/shared/components/table-action-row.component.ts +++ b/src/app/shared/components/table-action-row.component.ts @@ -1,5 +1,5 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Button } from 'primeng/button'; @Component({ @@ -12,6 +12,7 @@ export class TableActionRowComponent { @Input() showEdit = false; @Input() showDelete = false; @Input() showDetails = false; + @Input() showDetailsText: string = 'جزییات'; @Output() edit = new EventEmitter(); @Output() delete = new EventEmitter();