From 005643ae92c1646498b119c37720264e5bd95bbf Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 5 Jun 2023 10:14:48 +0100 Subject: [PATCH] remove publicates --- src/app/pages/events/events.page.ts | 29 ++++++++++++------- .../book-meeting-modal.page.ts | 2 +- src/app/services/aesencrypt.service.ts | 17 +++++++---- src/app/services/auth.service.ts | 3 ++ .../despachos-pr/despachos-pr.page.ts | 4 +-- .../despachos/despachos.page.ts | 4 +-- .../diplomas-assinar/diplomas-assinar.page.ts | 4 +-- .../diplomas-gerar/diplomas-gerar.page.ts | 17 +++++++++-- .../diplomas/diplomas.page.ts | 2 +- .../events-to-approve.page.ts | 2 +- .../expedientes-pr/expedientes-pr.page.ts | 4 +-- .../expedients/expedients.page.ts | 4 +-- src/environments/suport/doneIt.ts | 2 +- version/git-version.ts | 12 ++++---- 14 files changed, 66 insertions(+), 40 deletions(-) diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 91ce6acd0..a536f909e 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -291,23 +291,30 @@ export class EventsPage implements OnInit { } + firstEnter = false LoadList() { - this.showCorrespondenciasLoader = true - this.processes.GetTaskListExpediente(false).subscribe(result => { + if(this.firstEnter) { + this.showCorrespondenciasLoader = true + this.processes.GetTaskListExpediente(false).subscribe(result => { - let ExpedienteTask = result.map(e => this.expedienteTaskPipe.transform(e)) + let ExpedienteTask = result.map(e => this.expedienteTaskPipe.transform(e)) - this.listToPresentexpediente = ExpedienteTask; + this.listToPresentexpediente = ExpedienteTask; - this.storage.set('process', ExpedienteTask) + this.storage.set('process', ExpedienteTask) - this.showCorrespondenciasLoader = false - }, ((error) => { + this.showCorrespondenciasLoader = false + }, ((error) => { - this.showCorrespondenciasLoader = false - // - this.getEventsFromLocalDb(); - })); + this.showCorrespondenciasLoader = false + // + this.getEventsFromLocalDb(); + })); + } + + this.firstEnter = true + + } sortArrayISODate(myArray: any) { diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 8ece236cd..5c1132cc6 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -260,7 +260,7 @@ export class BookMeetingModalPage implements OnInit { async saveTask() { - if(SessionStore.user.Profile == 'MDGPR') { + if(SessionStore.user.Profile != 'PR') { this.injectValidation() this.runValidation() if(this.Form.invalid) return false diff --git a/src/app/services/aesencrypt.service.ts b/src/app/services/aesencrypt.service.ts index eac87d623..ee98d34c7 100644 --- a/src/app/services/aesencrypt.service.ts +++ b/src/app/services/aesencrypt.service.ts @@ -9,21 +9,26 @@ export class AESEncrypt { ivArray = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] constructor() { } - encrypt(encryptData, pass) { + encrypt(password, email) { + // debugger; + // console.log({password, email}) var text = "Pro-it te espera!!!!"; //Creating the Vector Key + //console.log({'this.toHexString(this.ivArray)': this.toHexString(this.ivArray),'this.ivArray': this.ivArray }) var iv = CryptoJS.enc.Hex.parse(this.toHexString(this.ivArray)); //Encoding the Password in from UTF8 to byte array - var Pass = CryptoJS.enc.Utf8.parse(pass); + var Email = CryptoJS.enc.Utf8.parse(email); + //console.log('Pass.toString()', Email.toString()) //Encoding the Salt in from UTF8 to byte array var Salt = CryptoJS.enc.Utf8.parse("gabinetedigital"); + //console.log('Salt.toString()', Salt.toString()) //Creating the key in PBKDF2 format to be used during the decryption - var key128Bits1000Iterations = CryptoJS.PBKDF2(Pass.toString(CryptoJS.enc.Utf8), Salt, { keySize: 128 / 32, iterations: 1000 }); + var key128Bits1000Iterations = CryptoJS.PBKDF2(Email.toString(CryptoJS.enc.Utf8), Salt, { keySize: 128 / 32, iterations: 1000 }); + //console.log(key128Bits1000Iterations.toString()) //Decrypting the string contained in cipherParams using the PBKDF2 key - var decrypted = CryptoJS.AES.encrypt(encryptData, key128Bits1000Iterations, { mode: CryptoJS.mode.CBC, iv: iv, padding: CryptoJS.pad.Pkcs7 }); - // - + var decrypted = CryptoJS.AES.encrypt(password, key128Bits1000Iterations, { mode: CryptoJS.mode.CBC, iv: iv, padding: CryptoJS.pad.Pkcs7 }); + // return decrypted.toString(); } diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index db08d7588..b94755c80 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -75,6 +75,9 @@ export class AuthService { async login(user: UserForm, {saveSession = true}): Promise { user.BasicAuthKey = 'Basic ' + btoa(user.username + ':' + this.aesencrypt.encrypt(user.password,user.username )); + // Basic peter.maquiran@equilibrium.co.ao:senha123456 + // console.log(user.BasicAuthKey) + this.headers = this.headers.set('Authorization', user.BasicAuthKey); this.opts = { headers: this.headers, diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index 990d84d71..813a2bf7e 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -21,7 +21,7 @@ import { ThemeService } from 'src/app/services/theme.service' export class DespachosPrPage implements OnInit { customTaskPipe = new CustomTaskPipe() - skeletonLoader = true + skeletonLoader = false loggeduser: LoginUserRespose; despachosprstore = DespachosprStore; @@ -48,7 +48,7 @@ constructor ( ngOnInit() { - this.LoadList() + // this.LoadList() this.router.events.forEach((event) => { if (event instanceof NavigationStart && diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index ed4a9d1f7..f01dee117 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -12,7 +12,7 @@ import { ThemeService } from 'src/app/services/theme.service' }) export class DespachosPage implements OnInit { - skeletonLoader = true; + skeletonLoader = false; filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' showSearch = false searchSubject = '' @@ -29,7 +29,7 @@ export class DespachosPage implements OnInit { ngOnInit() { - this.LoadList(); + // this.LoadList(); this.router.events.forEach((event) => { if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?despachos=true')) { diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index c22844323..1d1e42989 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -16,7 +16,7 @@ import { TaskService } from 'src/app/services/task.service' export class DiplomasAssinarPage implements OnInit { serialNumber:string; - skeletonLoader = true + skeletonLoader = false deplomasStore = DeplomasStore customTaskPipe = new CustomTaskPipe() @@ -39,7 +39,7 @@ export class DiplomasAssinarPage implements OnInit { ngOnInit() { - this.LoadList() + // this.LoadList() this.router.events.forEach((event) => { if (event instanceof NavigationStart && '/home/gabinete-digital?diplomasassinar=true'.startsWith(event.url)) { diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts index 42a64cc2f..531474ecb 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts @@ -17,7 +17,7 @@ export class DiplomasGerarPage implements OnInit { diplomasList:DailyWorkTask[] = []; serialNumber:string; - skeletonLoader = true + skeletonLoader = false deplomasStore = DeplomasStore customTaskPipe = new CustomTaskPipe() @@ -39,8 +39,19 @@ export class DiplomasGerarPage implements OnInit { ngOnInit() { - this.LoadList() - this.dynamicSearch() + this.router.events.forEach((event) => { + if (event instanceof NavigationStart && '/home/gabinete-digital/?gerarDiplomas=true'.startsWith(event.url)) { + if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { + this.LoadList() + this.dynamicSearch() + } else { + this.LoadList() + this.dynamicSearch() + } + } + }); + + } diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 8688520b3..46eb6110b 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -48,7 +48,7 @@ export class DiplomasPage implements OnInit { ngOnInit() { // update list - this.LoadList() + // this.LoadList() this.router.events.forEach((event) => { if (event instanceof NavigationStart && '/home/gabinete-digital?diplomas=true'.startsWith(event.url)) { diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index 419197b81..7274e8a4c 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -67,7 +67,7 @@ export class EventsToApprovePage implements OnInit { } } - this.LoadToApproveEvents(); + // this.LoadToApproveEvents(); this.router.events.forEach((event) => { if (event instanceof NavigationStart && diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 06bd79148..f8543c344 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -20,7 +20,7 @@ export class ExpedientesPrPage implements OnInit { taskslist = []; serialNumber:string; - skeletonLoader = true; + skeletonLoader = false; expedienteGdStore = ExpedienteGdStore; customTaskPipe = new CustomTaskPipe() expedienteTaskPipe = new ExpedienteTaskPipe() @@ -48,7 +48,7 @@ export class ExpedientesPrPage implements OnInit { ngOnInit() { - this.LoadList() + // this.LoadList() this.router.events.forEach((event) => { if (event instanceof NavigationStart && diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 4f07d031c..a125a65d5 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -20,7 +20,7 @@ export class ExpedientsPage implements OnInit { serialNumber: string; @Input() profile: string; - skeletonLoader = true + skeletonLoader = false expedientegbstore = ExpedienteGdStore expedienteTaskPipe = new ExpedienteTaskPipe() @@ -53,7 +53,7 @@ export class ExpedientsPage implements OnInit { ngOnInit() { //Inicializar segment this.segment = "expedientes"; - this.LoadList() + // this.LoadList() this.router.events.forEach((event) => { if (event instanceof NavigationStart && diff --git a/src/environments/suport/doneIt.ts b/src/environments/suport/doneIt.ts index 5f3c8b40e..bb4752ed4 100644 --- a/src/environments/suport/doneIt.ts +++ b/src/environments/suport/doneIt.ts @@ -31,7 +31,7 @@ export const doneITDev: Environment = { production: true, domain: 'equilibrium.co.ao', defaultuser: 'evandre.dasilva@equilibrium.co.ao', - defaultuserpwd: 'Luand@1113', + defaultuserpwd: 'Luand@1114', chatOffline: true, presidential: false, version: versionData, diff --git a/version/git-version.ts b/version/git-version.ts index b79f9872a..9580bd538 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "1fee8518c", - "SHA": "1fee8518ce6dcf725444ab92aac7b4749d5a5fca", + "shortSHA": "a1657b1e8", + "SHA": "a1657b1e846abdb35846a4534096dad901aea6eb", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon May 29 15:19:13 2023 +0100'", - "lastCommitMessage": "add notification message", - "lastCommitNumber": "4948", + "lastCommitTime": "'Mon May 29 15:29:24 2023 +0100'", + "lastCommitMessage": "update", + "lastCommitNumber": "4949", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/services/aesencrypt.service.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/environments/suport/doneIt.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file