diff --git a/Mohem/package.json b/Mohem/package.json old mode 100755 new mode 100644 index 54683c89..3caf1fb0 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -101,6 +101,7 @@ "date-fns": "^1.30.1", "es6-promise-plugin": "^4.1.0", "ionic2-calendar": "^0.5.8", + "ionic4-rating": "^1.0.9", "ng-circle-progress": "^1.5.1", "ng2-file-upload": "^1.3.0", "ng2-pdf-viewer": "^5.3.2", @@ -221,4 +222,4 @@ "ios" ] } -} \ No newline at end of file +} diff --git a/Mohem/src/app/app-routing.module.ts b/Mohem/src/app/app-routing.module.ts index 082f65cf..b4b5da86 100644 --- a/Mohem/src/app/app-routing.module.ts +++ b/Mohem/src/app/app-routing.module.ts @@ -23,8 +23,9 @@ const routes: Routes = [ { path: 'attendance-tracking', loadChildren: './attendance-tracking/attendance-tracking.module#AttendanceTrackingPageModule' }, { path: 'itemforsale', loadChildren: './itemforsale/itemforsale.module#ItemforsalePageModule' }, { path: 'offersdiscount', loadChildren: './offersdiscount/offersdiscount.module#OffersdiscountPageModule' }, - // { path: 'mowadhafi', loadChildren: './mowadhafi/mowadhafi/mowadhafi.module#MowadhafiPageModule' }, - { path: 'mowadhafi', loadChildren: './mowadhafi/mowadhafi.module#MowadhafiPageModule' } + { path: 'mowadhafi', loadChildren: './mowadhafi/mowadhafi.module#MowadhafiPageModule' }, + { path: 'erm-channel', loadChildren: './erm-channel/erm-channel.module#ErmChannelPageModule' }, + { path: 'backend-integrations', loadChildren: './backend-integrations/backend-integrations.module#BackendIntegrationsPageModule' } diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index f0c5d562..f5ba5e91 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -164,7 +164,6 @@ {{notBadge}} - - - + + diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index b4ec28bb..aada661e 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -56,15 +56,27 @@ + - - - - - - - - + + + {{'general,other-services' | translate}} + + + + + + + + + + + + + + + + diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 5a8e6ff7..3eaf395c 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -783,9 +783,12 @@ export class HomePage implements OnInit { return await modal.present(); } itemForSale() { - this.common.navigateForward('/itemforsale/home'); + this.common.navigateForward('/itemforsale/items'); } offersDiscount() { this.common.navigateForward('/offersdiscount/home'); } + openAnnouncement(){ + this.common.openAnnouncement(); + } } diff --git a/Mohem/src/app/itemforsale/home/home.component.html b/Mohem/src/app/itemforsale/home/home.component.html index ef0a3a6c..709ca806 100644 --- a/Mohem/src/app/itemforsale/home/home.component.html +++ b/Mohem/src/app/itemforsale/home/home.component.html @@ -13,14 +13,14 @@
-
Select Category
-
Completed
+
{{ts.trPK('itemforsale','select-category')}}
+
{{ts.trPK('itemforsale','completed')}}
-
Add Details
+
{{ts.trPK('itemforsale','add-details')}}
{{step >2 ? "Completed" : "Locked"}}
@@ -28,7 +28,7 @@
-
Review & Sell
+
{{ts.trPK('itemforsale','review-sell')}}
{{step >3 ? "Completed" : "Locked"}}
diff --git a/Mohem/src/app/itemforsale/itemforsale.module.ts b/Mohem/src/app/itemforsale/itemforsale.module.ts index bde723c4..6a7aea24 100644 --- a/Mohem/src/app/itemforsale/itemforsale.module.ts +++ b/Mohem/src/app/itemforsale/itemforsale.module.ts @@ -10,6 +10,7 @@ import { HomeComponent } from './home/home.component'; import { ItemsComponent } from './items/items.component'; import { ItemDetailsComponent } from './item-details/item-details.component'; import { MyAdsComponent } from './my-ads/my-ads.component'; +import { HmgCommonModule } from '../hmg-common/hmg-common.module'; const routes: Routes = [ { @@ -41,6 +42,7 @@ const routes: Routes = [ CommonModule, FormsModule, IonicModule, + HmgCommonModule, RouterModule.forChild(routes) ], declarations: [ItemforsalePage, HomeComponent, ItemsComponent, ItemDetailsComponent, MyAdsComponent] diff --git a/Mohem/src/app/itemforsale/items/items.component.html b/Mohem/src/app/itemforsale/items/items.component.html index 3b1d5d63..65186524 100644 --- a/Mohem/src/app/itemforsale/items/items.component.html +++ b/Mohem/src/app/itemforsale/items/items.component.html @@ -8,31 +8,34 @@
- + - Item for sale + {{ts.trPK('itemforsale','title')}} - My Posted Ads + {{ts.trPK('itemforsale','my-posted-ad')}}
- +
+
+ +
- + -

Browse Category

+

{{ts.trPK('itemforsale','browse-categories')}}

@@ -149,6 +152,7 @@
+
@@ -173,12 +177,13 @@ +
- - + +
- - {{ts.trPK('general','next')}} + + {{ts.trPK('itemforsale','create-new-ad')}}
diff --git a/Mohem/src/app/itemforsale/items/items.component.scss b/Mohem/src/app/itemforsale/items/items.component.scss index 01fd8409..96f389c8 100644 --- a/Mohem/src/app/itemforsale/items/items.component.scss +++ b/Mohem/src/app/itemforsale/items/items.component.scss @@ -75,6 +75,11 @@ ion-card-title{ .green{ color:#00AE4D; } +ion-segment-button{ + --background-checked: #000; + --indicator-color : transparent!important; + border: none; +} ion-segment-button ion-label{ padding: 0; font-size: 12px; @@ -105,4 +110,26 @@ margin: 5px; } .edit{ margin-left:20px !important; +} +.fab-button{ + position: fixed; + bottom: 5%; + z-index: 2; + right: 10%; +} +.fab-button ion-fab-button{ + --background: #259CB8; +} +ion-footer{ + position: absolute; + bottom: 0; +} +ion-footer .footer-button{ + --background: #259CB8; + width: 80%; + background: #259CB8; + border-radius: 10px; +} +ion-segment{ + height:40px } \ No newline at end of file diff --git a/Mohem/src/app/itemforsale/items/items.component.ts b/Mohem/src/app/itemforsale/items/items.component.ts index f93913bb..73fc2398 100644 --- a/Mohem/src/app/itemforsale/items/items.component.ts +++ b/Mohem/src/app/itemforsale/items/items.component.ts @@ -18,4 +18,8 @@ export class ItemsComponent implements OnInit { segmentChanged(value) { this.segment = value.detail.value; } + openSale() { + this.cs.navigateForward('/itemforsale/home'); + } + } diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index 0f66b227..d34d972a 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -474,7 +474,7 @@ {{action.name}} - Request Info + {{'worklistMain, worklistMain' | translate}} diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index 5df1b8b5..7a2f6d89 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -58,7 +58,7 @@ - + @@ -108,7 +108,7 @@ -
+
diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss index a7c50320..bf94ef38 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss @@ -27,9 +27,13 @@ } .star-fav{ float: right; - margin: 15px; + margin: 10px; + } + .star-fav-left{ + float: right; + margin: 10px 5px; } - .uk-margin{margin: 15px 0px 0px 15px; + .uk-margin{margin: 15px 15px 0px 15px; font-weight: bold; clear: both; position: relative; @@ -57,4 +61,5 @@ } .square{ clear: both; - } \ No newline at end of file + } + \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index 7536c23e..a0af5788 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -40,7 +40,7 @@ - + @@ -75,7 +75,7 @@ {{employee.NAME}} -
+
@@ -100,7 +100,7 @@ {{employee.EMPLOYEE_DISPLAY_NAME}} -
+
@@ -128,7 +128,7 @@ -
+
@@ -162,7 +162,7 @@ - +

diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index ac775fbf..b9b5da54 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -81,16 +81,18 @@ button.item-button.button.button-md.button-clear.button-clear-md { border-radius: 21px; padding-left: 10px !important; } + .filterInput-ar{ // border: solid var(--gray) 1px; // border-radius: 21px; // padding-left: 10px !important; border: solid var(--gray) 1px; border-radius: 21px; + // width:250px // padding-left: 145px !important; - margin-left: 123px; + //margin-left: 123px; // padding-right: 129px; - margin-right: -136px; + //margin-right: -136px; } .filterBtn{ @@ -178,9 +180,9 @@ ion-radio{ } .star-fav{ float: right; - margin: 15px; + margin: 15px 0px 0px 0px; } -.uk-margin{margin: 15px 0px 0px 15px; +.uk-margin{margin: 15px 15px 0px 15px; font-weight: bold; clear: both; position: relative; @@ -190,4 +192,8 @@ ion-radio{ bottom: 10px; position: relative;} + .star-fav-left{ + float: left; + margin: 10px 5px; + } \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index b6557cc5..71b1570d 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -78,6 +78,7 @@ export class WorkListReplacementRollComponent implements OnInit { if (requestInfoDel != null) { this.userSelected = true; this.inputSearch = requestInfoDel.NAME; + this.selEmp = requestInfoDel; } } diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss index c40369aa..b625942e 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss @@ -87,6 +87,7 @@ border-radius: 21px; padding-left: 10px !important; } + .filterBtn{ background: var(--newgreen); --background: var (--newgreen); diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss index 409f7446..cf5e4beb 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss @@ -42,9 +42,9 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin:15px 10px 0px 0px; } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss index 61bff403..ee5a0d37 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss @@ -34,10 +34,10 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin: 15px 10px 0px 0px; } .name{ color:black !important ;font-weight: bold; diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss index 409f7446..d5902df1 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss @@ -42,9 +42,9 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin: 15px 10px 0px 0px; } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss index 76877e22..a8895a39 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss @@ -44,8 +44,8 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin:15px 10px 0px 0px; } diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss index d9e971bd..e8434bee 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -97,12 +97,13 @@ .dateActionHistory{ display: inline-block; margin-left: 5px; + text-align: left; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin: 15px 10px 0px 0px; } diff --git a/Mohem/src/app/offersdiscount/home/home.component.html b/Mohem/src/app/offersdiscount/home/home.component.html index c3fe6413..133c86cc 100644 --- a/Mohem/src/app/offersdiscount/home/home.component.html +++ b/Mohem/src/app/offersdiscount/home/home.component.html @@ -4,7 +4,7 @@ - {{ts.trPK('itemforsale','title')}} + {{ts.trPK('itemforsale','offersdiscount')}}
@@ -17,13 +17,13 @@ - + -

Browse Category

+

{{ts.trPK('itemforsale','browse-categories')}}

diff --git a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html index 6e684c6d..df6095d9 100644 --- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html +++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html @@ -4,7 +4,7 @@ - {{ts.trPK('itemforsale','title')}} + {{ts.trPK('itemforsale','offersdiscount')}}
diff --git a/Mohem/src/app/offersdiscount/offersdiscount.module.ts b/Mohem/src/app/offersdiscount/offersdiscount.module.ts index 4c53786e..c453cbe2 100644 --- a/Mohem/src/app/offersdiscount/offersdiscount.module.ts +++ b/Mohem/src/app/offersdiscount/offersdiscount.module.ts @@ -8,6 +8,7 @@ import { IonicModule } from '@ionic/angular'; import { OffersdiscountPage } from './offersdiscount.page'; import { HomeComponent } from './home/home.component'; import { OfferDetailsComponent } from './offer-details/offer-details.component'; +import { HmgCommonModule } from '../hmg-common/hmg-common.module'; const routes: Routes = [ @@ -34,6 +35,7 @@ const routes: Routes = [ CommonModule, FormsModule, IonicModule, + HmgCommonModule, RouterModule.forChild(routes) ], declarations: [OffersdiscountPage, HomeComponent, OfferDetailsComponent] diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss index b8e5d124..d44e960a 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss @@ -116,8 +116,8 @@ button.item-button.button.button-md.button-clear.button-clear-md { .filterInput-ar{ border: solid var(--gray) 1px; border-radius: 21px; - margin-left: 115px; - margin-right: -132px; + // margin-left: 115px; + // margin-right: -132px; } .filterBtn{ diff --git a/Mohem/src/assets/icon/home/HR req.png b/Mohem/src/assets/icon/home/HR req.png new file mode 100644 index 00000000..77bb9db7 Binary files /dev/null and b/Mohem/src/assets/icon/home/HR req.png differ diff --git a/Mohem/src/assets/icon/home/announcement@2x.png b/Mohem/src/assets/icon/home/announcement@2x.png new file mode 100644 index 00000000..f80dd054 Binary files /dev/null and b/Mohem/src/assets/icon/home/announcement@2x.png differ diff --git a/Mohem/src/assets/icon/home/item_for_sale.png b/Mohem/src/assets/icon/home/item_for_sale.png new file mode 100644 index 00000000..2e9cbbe3 Binary files /dev/null and b/Mohem/src/assets/icon/home/item_for_sale.png differ diff --git a/Mohem/src/assets/icon/home/offers_discount.png b/Mohem/src/assets/icon/home/offers_discount.png new file mode 100644 index 00000000..d081b00c Binary files /dev/null and b/Mohem/src/assets/icon/home/offers_discount.png differ diff --git a/Mohem/src/assets/icon/rate/bad.svg b/Mohem/src/assets/icon/rate/bad.svg new file mode 100644 index 00000000..1a717423 --- /dev/null +++ b/Mohem/src/assets/icon/rate/bad.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/icon/rate/close.svg b/Mohem/src/assets/icon/rate/close.svg new file mode 100644 index 00000000..195fbfe8 --- /dev/null +++ b/Mohem/src/assets/icon/rate/close.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/Mohem/src/assets/icon/rate/dislike.svg b/Mohem/src/assets/icon/rate/dislike.svg new file mode 100644 index 00000000..9a70b738 --- /dev/null +++ b/Mohem/src/assets/icon/rate/dislike.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Mohem/src/assets/icon/rate/good.svg b/Mohem/src/assets/icon/rate/good.svg new file mode 100644 index 00000000..690d4d0b --- /dev/null +++ b/Mohem/src/assets/icon/rate/good.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/icon/rate/info.svg b/Mohem/src/assets/icon/rate/info.svg new file mode 100644 index 00000000..039dfff8 --- /dev/null +++ b/Mohem/src/assets/icon/rate/info.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Mohem/src/assets/icon/rate/like.svg b/Mohem/src/assets/icon/rate/like.svg new file mode 100644 index 00000000..4611580d --- /dev/null +++ b/Mohem/src/assets/icon/rate/like.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Mohem/src/assets/icon/rate/normal.svg b/Mohem/src/assets/icon/rate/normal.svg new file mode 100644 index 00000000..1885ab6a --- /dev/null +++ b/Mohem/src/assets/icon/rate/normal.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/icon/rate/poor.svg b/Mohem/src/assets/icon/rate/poor.svg new file mode 100644 index 00000000..95ce430d --- /dev/null +++ b/Mohem/src/assets/icon/rate/poor.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/icon/rate/star-half.svg b/Mohem/src/assets/icon/rate/star-half.svg new file mode 100644 index 00000000..2b0894e5 --- /dev/null +++ b/Mohem/src/assets/icon/rate/star-half.svg @@ -0,0 +1,4 @@ + + + + diff --git a/Mohem/src/assets/icon/rate/star-unfill.svg b/Mohem/src/assets/icon/rate/star-unfill.svg new file mode 100644 index 00000000..0b0fc380 --- /dev/null +++ b/Mohem/src/assets/icon/rate/star-unfill.svg @@ -0,0 +1,4 @@ + + + + diff --git a/Mohem/src/assets/icon/rate/star0fill.svg b/Mohem/src/assets/icon/rate/star0fill.svg new file mode 100644 index 00000000..51627d8f --- /dev/null +++ b/Mohem/src/assets/icon/rate/star0fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/icon/rate/xcellent.svg b/Mohem/src/assets/icon/rate/xcellent.svg new file mode 100644 index 00000000..eab98b33 --- /dev/null +++ b/Mohem/src/assets/icon/rate/xcellent.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index e1bf2045..1379abef 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -213,6 +213,18 @@ "en": "Allow the Mohemm app to access your location for marking your attendance", "ar": "اسمح لتطبيق مهم بالوصول إلى موقعك لتحديد حضورك" }, + "other-services": { + "en": "Other Services", + "ar": "خدمات أخرى" + }, + "items-sales": { + "en": "Items for sale", + "ar": "بضاعه للبع" + }, + "offers-discount": { + "en": "Offers & Discount", + "ar": "العروض والخصومات" + }, "not-now": { "en": "not now", "ar": "لاحقاً" @@ -2131,121 +2143,121 @@ "en": "you shoud add comment", "ar": "يجب عليك اضافة تعليق" }, - "product-name":{ - "en":"Product Name", - "ar":"اسم المنتج" + "product-name": { + "en": "Product Name", + "ar": "اسم المنتج" }, - "product-description":{ - "en":"Product Description", - "ar":"وصف للمنتج" + "product-description": { + "en": "Product Description", + "ar": "وصف للمنتج" }, - "Unit-price":{ - "en":"Unit Price", - "ar":"سعر الوحدة" + "Unit-price": { + "en": "Unit Price", + "ar": "سعر الوحدة" }, - "manufacturer-name":{ - "en":"Manufacturer Name", - "ar":"اسم المصنع" + "manufacturer-name": { + "en": "Manufacturer Name", + "ar": "اسم المصنع" }, - "manufacturer-part-number":{ - "en":"Manufacturer Part Number", - "ar":"رقم قطعة المصنع" + "manufacturer-part-number": { + "en": "Manufacturer Part Number", + "ar": "رقم قطعة المصنع" }, - "supplier-name":{ - "en":"Supplier Name", - "ar":"اسم المورد" + "supplier-name": { + "en": "Supplier Name", + "ar": "اسم المورد" }, - "supplier-contact":{ - "en":"Supplier Contact", - "ar":"عقد المورد" + "supplier-contact": { + "en": "Supplier Contact", + "ar": "عقد المورد" }, - "charge-to-patient":{ - "en":"Charge to Patient", - "ar":"رسوم على المرضى" + "charge-to-patient": { + "en": "Charge to Patient", + "ar": "رسوم على المرضى" }, - "justification":{ - "en":"Justification", - "ar":"تبرير" + "justification": { + "en": "Justification", + "ar": "تبرير" }, - "item-code":{ - "en":"Item Code", - "ar":"رمز الصنف" + "item-code": { + "en": "Item Code", + "ar": "رمز الصنف" }, - "item-description":{ - "en":"Item Description", - "ar":"وصف الصنف" + "item-description": { + "en": "Item Description", + "ar": "وصف الصنف" }, - "group-code":{ - "en":"Group Code", - "ar":"رمز المجموعة" + "group-code": { + "en": "Group Code", + "ar": "رمز المجموعة" }, - "group-description":{ - "en":"Group Description", - "ar":"وصف المجموعة" + "group-description": { + "en": "Group Description", + "ar": "وصف المجموعة" }, - "subgroup-code":{ - "en":"Subgroup Code", - "ar":"رمز المجموعة الفرعية" + "subgroup-code": { + "en": "Subgroup Code", + "ar": "رمز المجموعة الفرعية" }, - "subgroup-description":{ - "en":"Subgroup Description", - "ar":"وصف المجموعة الفرعية" + "subgroup-description": { + "en": "Subgroup Description", + "ar": "وصف المجموعة الفرعية" }, - "primary-uom":{ - "en":"Primary UOM", - "ar":"Primary UOM" + "primary-uom": { + "en": "Primary UOM", + "ar": "Primary UOM" }, - "template-name":{ - "en":"Template Name", - "ar":"اسم القالب" + "template-name": { + "en": "Template Name", + "ar": "اسم القالب" }, - "item-creation-status":{ - "en":"Item Creation Status", - "ar":"حالة انشاء العنصر" + "item-creation-status": { + "en": "Item Creation Status", + "ar": "حالة انشاء العنصر" }, - "standardization-approval-status":{ - "en":"Standardization Approval Status", - "ar":"حالةالموافقة على المعايرة" + "standardization-approval-status": { + "en": "Standardization Approval Status", + "ar": "حالةالموافقة على المعايرة" }, - "standardization-approval-rejection-reason":{ - "en":"Standardization Approval Rejection Reason", - "ar":"سبب رفض الموافقة على المعايرة" + "standardization-approval-rejection-reason": { + "en": "Standardization Approval Rejection Reason", + "ar": "سبب رفض الموافقة على المعايرة" }, - "category":{ - "en":"Category", - "ar":"فئة" + "category": { + "en": "Category", + "ar": "فئة" }, - "requester":{ - "en":"Requester", - "ar":"مقدم الطلب" + "requester": { + "en": "Requester", + "ar": "مقدم الطلب" }, - "analyzed-by":{ - "en":"Analyzed By", - "ar":"تحليل بواسطة" + "analyzed-by": { + "en": "Analyzed By", + "ar": "تحليل بواسطة" }, - "approved-date":{ - "en":"Approved Date", - "ar":"تاريخ الموافقة" + "approved-date": { + "en": "Approved Date", + "ar": "تاريخ الموافقة" }, - "item-type":{ - "en":"Item Type", - "ar":"نوع الصنف" + "item-type": { + "en": "Item Type", + "ar": "نوع الصنف" }, - "related-to":{ - "en":"Related To", - "ar":"" + "related-to": { + "en": "Related To", + "ar": "" }, - "request-date":{ - "en":"Request Date", - "ar":"متعلق بـ" + "request-date": { + "en": "Request Date", + "ar": "متعلق بـ" }, - "analyzed-date":{ - "en":"Analyzed Date", - "ar":"تاريخ التحليل" + "analyzed-date": { + "en": "Analyzed Date", + "ar": "تاريخ التحليل" }, - "urgent":{ - "en":"Urgent", - "ar":"عاجل" + "urgent": { + "en": "Urgent", + "ar": "عاجل" } }, "worklistMain": { @@ -2820,6 +2832,42 @@ "title": { "en": "Item for sale", "ar": "سلعه للبيع" + }, + "my-posted-ad": { + "en": "My Posted Ads", + "ar": "إعلاناتي المنشورة" + }, + "browse-categories": { + "en": "Browse Categories", + "ar": "تصفح الفئات" + }, + "create-new-ad": { + "en": "Create new ad", + "ar": "إنشاء إعلان جديد" + }, + "select-category": { + "en": "Select Category", + "ar": "اختر الفئة" + }, + "completed": { + "en": "Completed", + "ar": "مكتمل" + }, + "add-details": { + "en": "Add Details", + "ar": "أضف التفاصيل" + }, + "review-sell": { + "en": "Review & Sell", + "ar": "مراجعة وبيع" + }, + "search-items": { + "en": "Search Items", + "ar": "عناصر البحث" + }, + "offersdiscount": { + "en": "Offers & Discount", + "ar": "العروض والخصومات" } }, "attendance-tracking": { diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 3c3a5deb..e47b5f2f 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1571,4 +1571,17 @@ table.monthview-datetable th small { .fav-profileImageDiv{ width: 100%; text-align: start; -} \ No newline at end of file +} +ion-segment-button { + --indicator-color: transparent !important; + --indicator-color-checked: transparent !important; + } + #surveyRatingNew ion-button{ + background: #fff !important; + } + #surveyRatingNew ion-buttons{ + border-radius: 12px; + background: #fff; + width: 75%; + margin: auto; + } \ No newline at end of file diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index 6d003cfc..e872fddf 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -475,7 +475,7 @@ left: 66px; } .dateActionHistory{ - text-align: end; + text-align: start; // margin-top: -25px; }