;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ SurveyComponent ],
+ schemas: [CUSTOM_ELEMENTS_SCHEMA],
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(SurveyComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/Mohem/src/app/erm-channel/survey/survey.component.ts b/Mohem/src/app/erm-channel/survey/survey.component.ts
new file mode 100644
index 00000000..fbcc59ea
--- /dev/null
+++ b/Mohem/src/app/erm-channel/survey/survey.component.ts
@@ -0,0 +1,20 @@
+import { Component, OnInit } from '@angular/core';
+import { NavController } from '@ionic/angular';
+import { CommonService } from 'src/app/hmg-common/services/common/common.service';
+import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
+
+@Component({
+ selector: 'app-survey',
+ templateUrl: './survey.component.html',
+ styleUrls: ['./survey.component.scss'],
+})
+export class SurveyComponent implements OnInit {
+ rate: any;
+ constructor(public ts: TranslatorService, public cs: CommonService, public nav: NavController) { }
+
+ ngOnInit() { }
+ skip() {
+ this.nav.pop();
+ CommonService.SKIP = true;
+ }
+}
diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts
index 83f50a82..2a029076 100644
--- a/Mohem/src/app/hmg-common/services/common/common.service.ts
+++ b/Mohem/src/app/hmg-common/services/common/common.service.ts
@@ -35,7 +35,7 @@ export class CommonService {
public static MOHEMM_WIFI_SSID = "";
public static MOHEMM_WIFI_PASSWORD = "";
-
+ public static SKIP = false;
public static months_en_long = [
'January',
'February',
@@ -81,8 +81,8 @@ export class CommonService {
private progressLoaders: any[] = [];
private loadingProgress: any;
- public updateImage:boolean=false;
- public setUpdateImg:any;
+ public updateImage: boolean = false;
+ public setUpdateImg: any;
DT: any;
activeType: any;
constructor(
@@ -105,7 +105,7 @@ export class CommonService {
public diagnostic: Diagnostic,
public iab: InAppBrowser,
private menu: MenuController,
- ) {}
+ ) { }
public back() {
// this.nav.pop();
@@ -118,61 +118,61 @@ export class CommonService {
public getMonthName(value: number): string {
switch (value) {
- case 1:
- return 'January';
- case 2:
- return 'February';
- case 3:
- return 'March';
- case 4:
- return 'April';
- case 5:
- return 'May';
- case 6:
- return 'June';
- case 7:
- return 'July';
- case 8:
- return 'August';
- case 9:
- return 'September';
- case 10:
- return 'October';
- case 11:
- return 'November';
- case 12:
- return 'December';
+ case 1:
+ return 'January';
+ case 2:
+ return 'February';
+ case 3:
+ return 'March';
+ case 4:
+ return 'April';
+ case 5:
+ return 'May';
+ case 6:
+ return 'June';
+ case 7:
+ return 'July';
+ case 8:
+ return 'August';
+ case 9:
+ return 'September';
+ case 10:
+ return 'October';
+ case 11:
+ return 'November';
+ case 12:
+ return 'December';
}
-}
+ }
-public getMonthNameAr(value: number): string {
+ public getMonthNameAr(value: number): string {
switch (value) {
- case 1:
- return 'يناير';
- case 2:
- return ' فبراير';
- case 3:
- return 'مارس';
- case 4:
- return 'أبريل';
- case 5:
- return 'مايو';
- case 6:
- return 'يونيو';
- case 7:
- return 'يوليو';
- case 8:
- return 'أغسطس';
- case 9:
- return 'سبتمبر';
- case 10:
- return ' اكتوبر';
- case 11:
- return ' نوفمبر';
- case 12:
- return 'ديسمبر';
+ case 1:
+ return 'يناير';
+ case 2:
+ return ' فبراير';
+ case 3:
+ return 'مارس';
+ case 4:
+ return 'أبريل';
+ case 5:
+ return 'مايو';
+ case 6:
+ return 'يونيو';
+ case 7:
+ return 'يوليو';
+ case 8:
+ return 'أغسطس';
+ case 9:
+ return 'سبتمبر';
+ case 10:
+ return ' اكتوبر';
+ case 11:
+ return ' نوفمبر';
+ case 12:
+ return 'ديسمبر';
}
-}
+ }
public round(value: number, decimal: number): string {
const valueStr = value.toString();
@@ -290,7 +290,7 @@ public getMonthNameAr(value: number): string {
public confirmNotAllowedDialog() {
this.openHome();
this.alertDialog(
- () => {},
+ () => { },
this.ts.trPK('general', 'ok'),
this.ts.trPK('general', 'info'),
this.ts.trPK('general', 'not-allowed')
@@ -436,7 +436,7 @@ public getMonthNameAr(value: number): string {
message: message,
buttons: [
{
- text:this.ts.trPK('general', 'ok'),
+ text: this.ts.trPK('general', 'ok'),
handler: () => {
if (onAccept) {
onAccept();
@@ -587,8 +587,8 @@ public getMonthNameAr(value: number): string {
public getDeviceType(): string {
if (this.platform.is('mobile')) {
- // return "Mobile " + (this.platform.is("ios") ? "Iphone" : "android");
- return (this.platform.is('ios') ? 'Iphone' : 'android');
+ // return "Mobile " + (this.platform.is("ios") ? "Iphone" : "android");
+ return (this.platform.is('ios') ? 'Iphone' : 'android');
} else {
return 'Desktop';
@@ -620,7 +620,7 @@ public getMonthNameAr(value: number): string {
private openBrowserHtml(url, onExit?, onFaild?, onSuccess?) {
const browser = window.open(url, '_blank', 'location=no');
- browser.addEventListener('loadstart', () => {});
+ browser.addEventListener('loadstart', () => { });
browser.addEventListener('loaderror', () => {
if (onFaild) {
@@ -696,7 +696,7 @@ public getMonthNameAr(value: number): string {
public openLocation(lat: number, lng: number) {
this.platform.ready().then(() => {
this.launchNavigation.navigate([lat, lng]).then(
- () => {},
+ () => { },
err => {
// this.failedToOpenMap();
window.open('https://maps.google.com/?q=' + lat + ',' + lng);
@@ -896,7 +896,7 @@ public getMonthNameAr(value: number): string {
return targetCode >= minDigit && targetCode <= maxDigit;
}
- public enterPage() {}
+ public enterPage() { }
private smsAlertDialog = null;
public presentSMSPasswordDialog(
@@ -928,7 +928,7 @@ public getMonthNameAr(value: number): string {
text: this.ts.trPK('general', 'cancel'),
role: 'cancel',
cssClass: 'cancel-button',
- handler: () => {}
+ handler: () => { }
},
{
text: this.ts.trPK('general', 'ok'),
@@ -1075,10 +1075,10 @@ public getMonthNameAr(value: number): string {
/*
open calls
*/
- public openAttenTrackingpage(){
+ public openAttenTrackingpage() {
this.nav.navigateForward(['/attendance-tracking/home']);
}
- public openAttendanceOptionsComponent(){
+ public openAttendanceOptionsComponent() {
this.nav.navigateForward(['/home/attendance-option']);
}
public openEitListPage() {
@@ -1122,10 +1122,10 @@ public getMonthNameAr(value: number): string {
public openPage(link: string) {
this.nav.navigateForward([link]);
}
- public static myTeamDetailUrl =['/my-team/details','/my-team/details-2']
+ public static myTeamDetailUrl = ['/my-team/details', '/my-team/details-2']
public openMyTeamDetails() {
- this.alternateNavigate(CommonService.myTeamDetailUrl,'teamDetail-open',true);
- // this.nav.navigateForward(["/my-team/details"]);
+ this.alternateNavigate(CommonService.myTeamDetailUrl, 'teamDetail-open', true);
+ // this.nav.navigateForward(["/my-team/details"]);
}
public openAbsencePage() {
this.nav.navigateForward(['/absence/home']);
@@ -1176,7 +1176,7 @@ public getMonthNameAr(value: number): string {
this.nav.navigateForward(['/notification/item-history-PO']);
}
- public openMOItemHistoryPage(){
+ public openMOItemHistoryPage() {
this.nav.navigateForward(['/notification/item-history-MO']);
}
public openQutationAnalysisPage() {
@@ -1227,7 +1227,7 @@ public getMonthNameAr(value: number): string {
}
-
+
public navigatePage(path) {
this.nav.navigateForward([path]);
}
@@ -1254,7 +1254,7 @@ public getMonthNameAr(value: number): string {
this.nav.navigateBack([url]);
}
-
+
private alternateNavigate(paths: string[], key: string, root = false) {
let url: string;
if (localStorage.getItem(key) === 'yes') {
@@ -1375,7 +1375,7 @@ public getMonthNameAr(value: number): string {
public formatDate(date) {
let FormatedDate;
console.log(date);
-
+
if (date) {
date = date.slice(0, 10);
FormatedDate = date.replace(/-/g, '/');
@@ -1400,34 +1400,34 @@ public getMonthNameAr(value: number): string {
return FormatedDate;
}
- public setUpdateImage (image,status?){
+ public setUpdateImage(image, status?) {
console.log('setUpdateImage');
- this.setUpdateImg=image;
- this.updateImage=status;
+ this.setUpdateImg = image;
+ this.updateImage = status;
}
- public getUpdateImage(){
+ public getUpdateImage() {
console.log('getUpdateImage');
- const objImg={
- img: this.setUpdateImg,
+ const objImg = {
+ img: this.setUpdateImg,
status: this.updateImage
}
return objImg;
-
+
+ }
+ setDeviceToken(deviceToken) {
+ this.DT = deviceToken;
}
- setDeviceToken(deviceToken){
- this.DT=deviceToken;
- }
- getDeviceToken(){
- return this.DT;
- }
+ getDeviceToken() {
+ return this.DT;
+ }
- setActiveTypeLogin(activeType){
- this.activeType=activeType;
- }
+ setActiveTypeLogin(activeType) {
+ this.activeType = activeType;
+ }
- getActiveTypeLogin(){
- return this.activeType;
- }
+ getActiveTypeLogin() {
+ return this.activeType;
+ }
}
diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html
index b4ec28bb..89568cb9 100644
--- a/Mohem/src/app/home/home.page.html
+++ b/Mohem/src/app/home/home.page.html
@@ -56,15 +56,26 @@
+
-
-
-
-
-
-
-
-
+
+
+ Other Services
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts
index 5a8e6ff7..d2856ac9 100644
--- a/Mohem/src/app/home/home.page.ts
+++ b/Mohem/src/app/home/home.page.ts
@@ -783,7 +783,7 @@ 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');
diff --git a/Mohem/src/app/itemforsale/items/items.component.html b/Mohem/src/app/itemforsale/items/items.component.html
index 3b1d5d63..fb5d94c2 100644
--- a/Mohem/src/app/itemforsale/items/items.component.html
+++ b/Mohem/src/app/itemforsale/items/items.component.html
@@ -8,7 +8,7 @@
-
+
Item for sale
@@ -19,8 +19,11 @@
-
+
+
+
+
@@ -32,7 +35,7 @@
- Browse Category
+ Browse Categories
@@ -149,6 +152,7 @@
+
@@ -173,12 +177,13 @@
+
-
-
+
+
-
+
diff --git a/Mohem/src/app/itemforsale/items/items.component.scss b/Mohem/src/app/itemforsale/items/items.component.scss
index 01fd8409..cbaa3538 100644
--- a/Mohem/src/app/itemforsale/items/items.component.scss
+++ b/Mohem/src/app/itemforsale/items/items.component.scss
@@ -75,6 +75,10 @@ ion-card-title{
.green{
color:#00AE4D;
}
+ion-segment-button{
+ --background-checked: #000;
+ --indicator-color : transparent!important;
+}
ion-segment-button ion-label{
padding: 0;
font-size: 12px;
@@ -105,4 +109,21 @@ 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%;
}
\ 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/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/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