bug fixes

enad-pre-live
Sultan Khan 4 years ago
parent 56b4a3e18b
commit 2a6f520d2b

@ -653,30 +653,15 @@ export class SmsPageComponent implements OnInit {
} }
} }
if (key === 9) { if (key === 9) {
return true; return true;
} }
if (sib) { if (sib) {
if (e.target.value === '') { if (e.target.value === '') {
sibPre.setFocus(); sibPre.setFocus();
} else { } else {
sib.setFocus(); sib.setFocus();
} }
} }
} }
} }

@ -14,6 +14,7 @@ import { EitService } from '../services/eit.service';
import { AddEitResponse } from '../models/add.eit.response'; import { AddEitResponse } from '../models/add.eit.response';
import { FileUploader } from 'ng2-file-upload'; import { FileUploader } from 'ng2-file-upload';
import { SubmitEitModalComponent } from '../submit-eit-modal/submit-eit-modal.component'; import { SubmitEitModalComponent } from '../submit-eit-modal/submit-eit-modal.component';
import { HomeComponent } from 'src/app/notification/home/home.component';
@Component({ @Component({
selector: 'app-confirm-add-eit', selector: 'app-confirm-add-eit',
@ -62,7 +63,7 @@ export class ConfirmAddEitComponent implements OnInit {
filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
direction: string; direction: string;
constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService) { constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService) {
this.direction = TranslatorService.getCurrentLanguageName() this.direction = TranslatorService.getCurrentLanguageName()
this.isSubmitBtnClicked = false; this.isSubmitBtnClicked = false;
@ -81,8 +82,8 @@ export class ConfirmAddEitComponent implements OnInit {
this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING ** this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING **
// console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails); // console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails);
this.P_TransactionID = this.cs.sharedService.getSharedData("TransactionIDResubmit", true); this.P_TransactionID = this.cs.sharedService.getSharedData("TransactionIDResubmit", true);
// let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); // let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true);
this.itemKey = this.getPassNotificationDetails.ITEM_KEY; this.itemKey = this.getPassNotificationDetails.ITEM_KEY;
this.pActionMode = "RESUBMIT"; this.pActionMode = "RESUBMIT";
this.menuType = "E"; this.menuType = "E";
@ -234,6 +235,7 @@ export class ConfirmAddEitComponent implements OnInit {
// this.navCtrl.popToRoot(); // this.navCtrl.popToRoot();
// this.cs.openHome(); // this.cs.openHome();
this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED);
this.cs.openNotificationPage(); this.cs.openNotificationPage();
} }
} }
@ -249,7 +251,7 @@ export class ConfirmAddEitComponent implements OnInit {
//open the modal with return data //open the modal with return data
let attachDocID = attachItems.ATTACHED_DOCUMENT_ID; let attachDocID = attachItems.ATTACHED_DOCUMENT_ID;
this.cs.sharedService.setSharedData( this.P_TransactionID, 'TransactionID'); this.cs.sharedService.setSharedData(this.P_TransactionID, 'TransactionID');
this.cs.sharedService.setSharedData(this.attachListOver.length, 'indexLastObj'); this.cs.sharedService.setSharedData(this.attachListOver.length, 'indexLastObj');
const modal = await this.modalController.create({ const modal = await this.modalController.create({
@ -298,7 +300,7 @@ export class ConfirmAddEitComponent implements OnInit {
/*****submit modal********/ /*****submit modal********/
async openSubmitModal() { async openSubmitModal() {
this.cs.sharedService.setSharedData( this.attachListOver, 'submitAttachmentList'); this.cs.sharedService.setSharedData(this.attachListOver, 'submitAttachmentList');
this.cs.sharedService.setSharedData(this.eitComments, 'eitComments'); this.cs.sharedService.setSharedData(this.eitComments, 'eitComments');
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: SubmitEitModalComponent, component: SubmitEitModalComponent,
@ -314,7 +316,7 @@ export class ConfirmAddEitComponent implements OnInit {
if (data.data == "cancel" || data.data == undefined) { if (data.data == "cancel" || data.data == undefined) {
return; return;
} else { } else {
this.startEitApproval(); this.startEitApproval();
} }
}); });
@ -482,7 +484,7 @@ export class ConfirmAddEitComponent implements OnInit {
}); });
onFileSelectedclick(event){ onFileSelectedclick(event) {
event.target.value = ''; event.target.value = '';
} }
@ -529,7 +531,7 @@ export class ConfirmAddEitComponent implements OnInit {
pushObject(fileData, name, type) { pushObject(fileData, name, type) {
console.log("before push: "+ this.index); console.log("before push: " + this.index);
//this.attachListOver.length++; //this.attachListOver.length++;
try { try {
let array = name.split('.'); let array = name.split('.');
@ -537,11 +539,11 @@ export class ConfirmAddEitComponent implements OnInit {
this.attachListOver.push( this.attachListOver.push(
{ {
AttachmentID: this.attachListOver.length, AttachmentID: this.attachListOver.length,
P_FILE_CONTENT_TYPE: attachType,//type.split('/')[1], P_FILE_CONTENT_TYPE: attachType,//type.split('/')[1],
P_FILE_DATA: fileData.split(',')[1], P_FILE_DATA: fileData.split(',')[1],
P_FILE_NAME: name,//.split('.')[0], P_FILE_NAME: name,//.split('.')[0],
P_TRANSACTION_ID: this.P_TransactionID P_TRANSACTION_ID: this.P_TransactionID
}) })
} catch (e) { } catch (e) {

@ -277,7 +277,7 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe';
AttendanceOptionsComponent, AttendanceOptionsComponent,
CardCalendarComponent, CardCalendarComponent,
SubmitAddressModalComponent, SubmitAddressModalComponent,
SanitizeHtmlPipe SanitizeHtmlPipe,
], ],
providers: [ providers: [
AttendScanService, AttendScanService,

@ -11,9 +11,11 @@
<div> <div>
<ion-card> <ion-card>
<ion-card-header> <ion-card-header>
<div class="header-img-main" [ngStyle]="{'background-image': 'url(' + details.Banner_Image + ')'}" ></div> <!-- <div class="header-img-main" [ngStyle]="{'background-image': 'url(' + details.Banner_Image + ')'}" ></div>
-->
<image-modal size="big" fontsize="1cm"
[src]="details.Banner_Image">
</image-modal>
<ion-card-title *ngIf="direction =='ltr'">{{details.Title}}</ion-card-title> <ion-card-title *ngIf="direction =='ltr'">{{details.Title}}</ion-card-title>
<ion-card-title *ngIf="direction =='rtl'">{{details.Title_AR}}</ion-card-title> <ion-card-title *ngIf="direction =='rtl'">{{details.Title_AR}}</ion-card-title>

@ -12,6 +12,7 @@ import { HmgCommonModule } from '../hmg-common/hmg-common.module';
import { OfferDiscountService } from './services/service'; import { OfferDiscountService } from './services/service';
import { FilterComponent } from './filter/filter.component'; import { FilterComponent } from './filter/filter.component';
import { LocationComponent } from './location/location.component'; import { LocationComponent } from './location/location.component';
import { ImageModalModule } from '../hmg-common/ui/image-modal/image-modal.module';
@ -48,6 +49,7 @@ const routes: Routes = [
FormsModule, FormsModule,
IonicModule, IonicModule,
HmgCommonModule, HmgCommonModule,
ImageModalModule,
RouterModule.forChild(routes) RouterModule.forChild(routes)
], ],
declarations: [OffersdiscountPage, HomeComponent, OfferDetailsComponent, FilterComponent, LocationComponent], declarations: [OffersdiscountPage, HomeComponent, OfferDetailsComponent, FilterComponent, LocationComponent],

@ -10,6 +10,7 @@ import { SubmitEitModalComponent } from 'src/app/eit/submit-eit-modal/submit-eit
import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
import { HomeComponent } from 'src/app/notification/home/home.component';
import { EITNotificatonBodyResponse } from 'src/app/notification/models/EITNotificationBodyRes'; import { EITNotificatonBodyResponse } from 'src/app/notification/models/EITNotificationBodyRes';
import { WorkListButtonRequest } from 'src/app/notification/models/NotificationButtonReq'; import { WorkListButtonRequest } from 'src/app/notification/models/NotificationButtonReq';
import { WorkListAttachViewComponent } from 'src/app/notification/work-list-attach-view/work-list-attach-view.component'; import { WorkListAttachViewComponent } from 'src/app/notification/work-list-attach-view/work-list-attach-view.component';
@ -103,6 +104,7 @@ export class ConfirmAddressComponent implements OnInit {
if (this.isContact) { if (this.isContact) {
this.itemKey = this.addrespList.SubmitPhonesTransactionList.P_ITEM_KEY; this.itemKey = this.addrespList.SubmitPhonesTransactionList.P_ITEM_KEY;
this.P_TransactionID = this.addrespList.SubmitPhonesTransactionList.P_TRANSACTION_ID; this.P_TransactionID = this.addrespList.SubmitPhonesTransactionList.P_TRANSACTION_ID;
this.headerTitle = this.ts.trPK('general', 'contact');
} else { } else {
this.itemKey = this.addrespList.SubmitAddressTransactionList.P_ITEM_KEY; this.itemKey = this.addrespList.SubmitAddressTransactionList.P_ITEM_KEY;
this.P_TransactionID = this.addrespList.SubmitAddressTransactionList.P_TRANSACTION_ID; this.P_TransactionID = this.addrespList.SubmitAddressTransactionList.P_TRANSACTION_ID;
@ -267,7 +269,7 @@ export class ConfirmAddressComponent implements OnInit {
this.cs.presentAlert(msg); this.cs.presentAlert(msg);
// } // }
// this.navCtrl.popToRoot(); // this.navCtrl.popToRoot();
this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED);
// this.cs.openHome(); // this.cs.openHome();
this.cs.openNotificationPage(); this.cs.openNotificationPage();
} }

@ -230,13 +230,15 @@
<br> <br>
<div *ngIf="phoneNumbers.length>0"> <div *ngIf="phoneNumbers.length>0">
<div *ngFor="let phone of phoneNumbers"> <div *ngFor="let phone of phoneNumbers">
<ion-label> <div *ngIf="phone.PHONE_ID">
<ion-label>
<h3 [ngClass]="direction === 'ltr'? 'type-label-text-form': 'type-label-text-form-ar' " >{{phone.PHONE_TYPE_MEANING}}</h3> <h3 [ngClass]="direction === 'ltr'? 'type-label-text-form': 'type-label-text-form-ar' " >{{phone.PHONE_TYPE_MEANING}}</h3>
</ion-label> </ion-label>
<h3 [ngClass]="direction === 'ltr'? 'result-label-text-form': 'result-label-text-form-ar' " >{{phone.PHONE_NUMBER}}</h3> <h3 [ngClass]="direction === 'ltr'? 'result-label-text-form': 'result-label-text-form-ar' " >{{phone.PHONE_NUMBER}}</h3>
<br> <br>
<br> <br>
</div>
</div> </div>
</div> </div>

@ -406,6 +406,7 @@ export class HomeComponent implements OnInit {
if (this.cs.validResponse(response)) { if (this.cs.validResponse(response)) {
this.cs.stopLoading(); this.cs.stopLoading();
this.phoneNumbers = response['GetEmployeePhonesList']; this.phoneNumbers = response['GetEmployeePhonesList'];
console.log(this.phoneNumbers);
this.cs.sharedService.setSharedData(this.phoneNumbers, ProfileService.EMP_PHONE); this.cs.sharedService.setSharedData(this.phoneNumbers, ProfileService.EMP_PHONE);
} }
}) })

@ -1639,4 +1639,14 @@ ion-segment-button {
.select-alert .alert-radio-label{ .select-alert .alert-radio-label{
font-size: 12px !important; font-size: 12px !important;
} }
.modal-image-viewer-landscape {
--height: 35% !important;
--width: 90% !important;
--border-radius: 0.4cm;
}
.modal-image-viewer-portrait {
--height: 45% !important;
--width: 60% !important;
--border-radius: 0.4cm;
}
Loading…
Cancel
Save