diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index b9e9c73a..22efebdf 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -175,6 +175,26 @@ {{ts.trPK('userProfile','HR-Request')}} +
+
+ {{file.name}}
{{ts.trPK('itemforsale','item-price')}}
{{ts.trPK('itemforsale','browse-categories')}}
diff --git a/Mohem/src/app/itemforsale/items/items.component.ts b/Mohem/src/app/itemforsale/items/items.component.ts
index a96d2a9e..a98e1105 100644
--- a/Mohem/src/app/itemforsale/items/items.component.ts
+++ b/Mohem/src/app/itemforsale/items/items.component.ts
@@ -22,13 +22,28 @@ export class ItemsComponent implements OnInit {
pageNo: number = 1;
tempSearch: any = [];
itemsByEmployee: any = [];
+ allCategory = {
+ categoryID: 0,
+ content: '',
+ isActive: true,
+ title: "All",
+ title_Ar: "الجميع",
+ }
constructor(public ts: TranslatorService, public route: ActivatedRoute, private sanitizer: DomSanitizer, public cs: CommonService, private itemService: ItemForSaleService, private authService: AuthenticationService) {
this.route
.params.subscribe(val => {
setTimeout(() => {
this.cs.startLoading();
- this.getItemsCategories();
- this.getItemsByEmployee();
+ var selectedFilter = this.cs.sharedService.getSharedData(ItemForSaleService.selected_filters);
+ if (selectedFilter) {
+ this.selectCategory(selectedFilter);
+ }
+ else {
+ this.getItemsCategories();
+ this.getItemsByEmployee();
+ }
+
+
}, 100);
});
@@ -43,6 +58,7 @@ export class ItemsComponent implements OnInit {
this.itemService.getCategories({}, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => {
this.categories = this.itemService.parser(result);
+ this.categories.unshift(this.allCategory);
this.cs.sharedService.setSharedData(this.categories, ItemForSaleService.CATEGORIES);
})
this.itemService.getItems({ pageNo: this.pageNo }, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => {
@@ -149,4 +165,7 @@ export class ItemsComponent implements OnInit {
}
})
}
+ openModel() {
+ this.cs.filterItemforSale();
+ }
}
diff --git a/Mohem/src/app/itemforsale/services/service.service.ts b/Mohem/src/app/itemforsale/services/service.service.ts
index 62ce6e9b..80f4c644 100644
--- a/Mohem/src/app/itemforsale/services/service.service.ts
+++ b/Mohem/src/app/itemforsale/services/service.service.ts
@@ -17,6 +17,7 @@ export class ItemForSaleService {
public static ITEMS_SELECTED = 'item-selected';
public static CATEGORIES = 'categories';
public static EDIT_ITEMS = 'edit-items';
+ public static selected_filters = 'selected_filter';
constructor(
public con: ConnectorService,
private authService: AuthenticationService,
diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts
index 5bfbba0b..8aba0e1c 100644
--- a/Mohem/src/app/profile/home/home.component.ts
+++ b/Mohem/src/app/profile/home/home.component.ts
@@ -323,7 +323,7 @@ export class HomeComponent implements OnInit {
} else if (allowVal == 'contact') {
this.openContact()
- } else if ('add-update-contact') {
+ } else if (allowVal == 'add-update-contact') {
this.transactionNo++;
this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: undefined, transNo: this.transactionNo }, 'AddEITData');
this.cs.openAddUpdateContact();
diff --git a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts
index 456a45c8..8fb275f0 100644
--- a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts
+++ b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts
@@ -48,7 +48,7 @@ export class ConcurrentReportComponent implements OnInit {
private validEitTransactionTbl: any = [];
eitSubmitAction: number = 0;
updatedValues: any = [];
- comtransNo: any = 0;
+ comtransNo: any = 1;
programList: any = [];
public template: any;
constructor(public cs: CommonService, private elementRef: ElementRef, public reports: ReportServiceService, public ts: TranslatorService, public eitService: EitService) { }
diff --git a/Mohem/src/assets/icon/select-all.svg b/Mohem/src/assets/icon/select-all.svg
new file mode 100644
index 00000000..f053110b
--- /dev/null
+++ b/Mohem/src/assets/icon/select-all.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index ed25d049..2c05fc99 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -3213,6 +3213,22 @@
}
},
"itemforsale": {
+ "slect-source-file": {
+ "en": "Select source file",
+ "ar": "حدد مصدر الملف"
+ },
+ "from-camera": {
+ "en": "Use Camera",
+ "ar": "استخدام الكاميرا"
+ },
+ "from-library": {
+ "en": "From Library",
+ "ar": "من ملفات الجهاز"
+ },
+ "from-icloud": {
+ "en": "From iCloud Drive",
+ "ar": "من iCloud Drive"
+ },
"warning": {
"en": "This ad will be valid for 2 week after approval",
"ar": "هذا الإعلان ساري المفعول لمدة أسبوعين بعد الموافقة"