diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.html b/Mohem/src/app/eit/add-eit/add-eit.component.html index a83c748d..91fde23b 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.html +++ b/Mohem/src/app/eit/add-eit/add-eit.component.html @@ -1,5 +1,5 @@ - + @@ -22,7 +22,7 @@
- + {{'vacation-rule, next-label' | translate}}
\ No newline at end of file diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.scss b/Mohem/src/app/eit/add-eit/add-eit.component.scss index c8182a3b..08f5fd5c 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.scss +++ b/Mohem/src/app/eit/add-eit/add-eit.component.scss @@ -11,7 +11,7 @@ ion-label { .daynamicForm-Label { font-size: 16px; - color: var(--customnavy) !important; + color: #a2a5a6 !important; display: block; overflow: hidden; -webkit-flex: 1; @@ -20,4 +20,20 @@ ion-label { white-space: normal; padding: 5px 0px; margin: 10px auto; + padding-left: 10px; +} + +.header-toolbar-new{ + --background: #22c6b3; } +.addEitOkButton{ + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #22c6b3; + width: 80% !important; + color: white!important; + border-radius: 16px !important; +} \ No newline at end of file diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index af315623..aa9cf636 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -1,5 +1,5 @@ - + {{headerTitle}} @@ -115,7 +115,7 @@ {{employee.APPROVER}} - {{employee.APPROVER_TYPE}} + {{employee.POSITION_TITLE}} @@ -260,7 +260,7 @@
- + {{ (isDelete ? 'general, delete' : 'general, submit') | translate }}
\ No newline at end of file diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss index c78deefc..7e35df19 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss @@ -210,4 +210,34 @@ height: 20px; text-align: center; font-size: 5px; +} + +.note-modal { + // width: 90%; + // height: 50%; + // top: 20%; + // left: 5%; + // right: 5%; + // bottom: 5%; + background: rgba(0, 0, 0, 0.5) !important; + padding: 30% 10% !important; + --height: 12cm !important; + // --width: 80% !important; + --border-radius:20px; + +} +.header-toolbar-new{ + --background: #22c6b3; +} + +.confirmEitOkButton{ + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #22c6b3; + width: 80% !important; + color: white!important; + border-radius: 16px !important; } \ No newline at end of file diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts index f8168390..608e2308 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts @@ -13,6 +13,7 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl import { EitService } from '../services/eit.service'; import { AddEitResponse } from '../models/add.eit.response'; import { FileUploader } from 'ng2-file-upload'; +import { SubmitEitModalComponent } from '../submit-eit-modal/submit-eit-modal.component'; @Component({ selector: 'app-confirm-add-eit', @@ -292,6 +293,37 @@ export class ConfirmAddEitComponent implements OnInit { return await modal.present(); } + /*****submit modal********/ + async openSubmitModal() { + this.cs.sharedService.setSharedData( this.attachListOver, 'submitAttachmentList'); + this.cs.sharedService.setSharedData(this.eitComments, 'eitComments'); + const modal = await this.modalController.create({ + component: SubmitEitModalComponent, + backdropDismiss: false, + + }); + modal.cssClass = 'note-modal'; + + modal.onDidDismiss() + .then((data) => { + console.log(data.data); + + if (data.data == "cancel" || data.data == undefined) { + return; + } else { + this.startEitApproval(); + } + }); + + return await modal.present(); + + + + + } + + + removeFile(objectitem) { @@ -500,7 +532,7 @@ export class ConfirmAddEitComponent implements OnInit { P_FILE_CONTENT_TYPE: attachType,//type.split('/')[1], P_FILE_DATA: fileData.split(',')[1], P_FILE_NAME: name,//.split('.')[0], - P_TRANSACTION_ID: this.TransactionID + P_TRANSACTION_ID: this.P_TransactionID }) } catch (e) { diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index 20b7eb2a..9e92fdd6 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -334,7 +334,7 @@ export class EitListComponent implements OnInit { // this.P_TransactionID=result.SubmitEITTransactionList.P_TRANSACTION_ID; // this.sharedData.setSharedData(result,AddEitResponse.SHARED_DATA); - // // this.sharedData.setSharedData(result.SubmitEITTransactionList.P_TRANSACTION_ID,"TransactionIDResubmit"); + // //this.cs.sharedService.setSharedData(result.SubmitEITTransactionList.P_TRANSACTION_ID,"TransactionIDResubmit"); // // this.sharedData.setSharedData(this.eitRequest,EitRequest.SHARED_DATA); this.cs.sharedService.setSharedData({ isResubmit: false, isDelete: this.isDelete }, 'confirmAddEITData') this.cs.openConfirmEitPage(); diff --git a/Mohem/src/app/eit/eit.module.ts b/Mohem/src/app/eit/eit.module.ts index 0e823e56..98d5bde0 100644 --- a/Mohem/src/app/eit/eit.module.ts +++ b/Mohem/src/app/eit/eit.module.ts @@ -13,6 +13,7 @@ import { EitListComponent } from './eit-list/eit-list.component'; import { DatePicker } from '@ionic-native/date-picker/ngx'; import { WorkListAttachViewComponent } from '../notification/work-list-attach-view/work-list-attach-view.component'; import { EitUpdateListComponent } from './eit-update-list/eit-update-list.component'; +import { SubmitEitModalComponent } from './submit-eit-modal/submit-eit-modal.component'; const routes: Routes = [ @@ -43,6 +44,10 @@ const routes: Routes = [ { path: 'eit-update-list', component: EitUpdateListComponent + }, + { + path: 'eit-submit-modal', + component: SubmitEitModalComponent } ] } @@ -63,7 +68,8 @@ const routes: Routes = [ AddEitComponent, ConfirmAddEitComponent, AddAttachComponent, - EitUpdateListComponent + EitUpdateListComponent, + SubmitEitModalComponent ], entryComponents: [ WorkListAttachViewComponent diff --git a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.html b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.html new file mode 100644 index 00000000..2a19db89 --- /dev/null +++ b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.html @@ -0,0 +1,39 @@ + + + + + +

Confirmation

+ +
+
+ No Attachment +
+
+ No Note +
+
+ + + + + Are you sure you want to submit + {{ts.trPK('general','ok')}} + + + + + {{ts.trPK('general','cancel')}} + + + + +
+ \ No newline at end of file diff --git a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss new file mode 100644 index 00000000..5803e3f2 --- /dev/null +++ b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss @@ -0,0 +1,53 @@ +.rowBtn{ + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; +} + +.Header{ + color: black !important; + font-size: 25px !important; + font-weight: bold !important;; + margin: 0; + text-align: center; + margin-bottom: 20px; +} + +.labelRadio{ + color: black !important; + font-weight: bold !important; + padding-bottom: 20px; +} + +.labelcheck{ + color: red !important; + font-weight: bold !important; + margin-bottom: 10px; +} + +.submitOkButton{ + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + --background:: #22c6b3; + width: 100% !important; + color: white!important; + border-radius: 16px !important; +} +.submitCancelButton{ + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + --background:: #094875; + width: 100% !important; + color: white!important; + border-radius: 16px !important; +} + + + diff --git a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.spec.ts b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.spec.ts new file mode 100644 index 00000000..7171d957 --- /dev/null +++ b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SubmitEitModalComponent } from './submit-eit-modal.component'; + +describe('SubmitEitModalComponent', () => { + let component: SubmitEitModalComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SubmitEitModalComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SubmitEitModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.ts b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.ts new file mode 100644 index 00000000..81ff9ffc --- /dev/null +++ b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.ts @@ -0,0 +1,36 @@ +import { Component, OnInit } from '@angular/core'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { ModalController } from '@ionic/angular'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; + +@Component({ + selector: 'app-submit-eit-modal', + templateUrl: './submit-eit-modal.component.html', + styleUrls: ['./submit-eit-modal.component.scss'], +}) +export class SubmitEitModalComponent implements OnInit { + submitAttachmentList :any =[]; + eitComments: string; + constructor( private ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService){ + this.submitAttachmentList = this.cs.sharedService.getSharedData('submitAttachmentList', false); + this.eitComments = this.cs.sharedService.getSharedData('eitComments', false); + } + + ngOnInit() { + console.log("modal"); + //this.actionBtns = this.cs.sharedService.getSharedData("passActionMore" , false); + console.log("modal"); + + } + closeModal() { + this.modalCtrl.dismiss(); + } + + + OkBtnModal() { + let data = "ok"; + this.modalCtrl.dismiss(data); + } + +} + diff --git a/Mohem/src/app/uI-elements/select.input.ts b/Mohem/src/app/uI-elements/select.input.ts index ea1346c7..f2797d44 100644 --- a/Mohem/src/app/uI-elements/select.input.ts +++ b/Mohem/src/app/uI-elements/select.input.ts @@ -23,7 +23,7 @@ export class SelectInput extends UiElement { if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" } if (this.hidden == "N") { this.hidden = "display:none;" } else { this.hidden = "" } const template = - "
" + + "
" + " " + "