peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-28 14:39:49 +01:00
parent 6dc2fddcfb
commit 2de4878b58
5 changed files with 99 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+23 -4
View File
@@ -6069,17 +6069,20 @@
}
},
"cordova-android": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.0.0.tgz",
"integrity": "sha512-2ZEgApK4LPMYW0zh/mLAH3CabzCaKE0yxQTzA2wTf0Eo2HHTJnRtDCf9spGf3nPOkubyXS6+pvzz5QzNHpVTqQ==",
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz",
"integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==",
"dev": true,
"requires": {
"android-versions": "^1.5.0",
"cordova-common": "^4.0.1",
"execa": "^4.0.2",
"fast-glob": "^3.2.4",
"fs-extra": "^9.0.1",
"is-path-inside": "^3.0.2",
"nopt": "^4.0.3",
"properties-parser": "^0.3.1",
"semver": "^7.3.4",
"which": "^2.0.2"
},
"dependencies": {
@@ -6121,6 +6124,12 @@
"pump": "^3.0.0"
}
},
"is-path-inside": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
"dev": true
},
"is-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
@@ -6146,6 +6155,15 @@
"path-key": "^3.0.0"
}
},
"semver": {
"version": "7.3.5",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
}
},
"universalify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -20269,7 +20287,8 @@
},
"ssri": {
"version": "6.0.1",
"resolved": "",
"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
"dev": true,
"requires": {
"figgy-pudding": "^3.5.1"
package.json
+1 -1
View File
@@ -93,7 +93,7 @@
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
"codelyzer": "^6.0.0",
"cordova-android": "^9.0.0",
"cordova-android": "^9.1.0",
"cordova-browser": "^6.0.0",
"cordova-ios": "^6.2.0",
"cordova-plugin-androidx": "^3.0.0",
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+15 -8
View File
@@ -66,11 +66,21 @@ export class BookMeetingModalPage implements OnInit {
showLoader = false
get dateStart () {
return this.dateControlStart.value
if( window.innerWidth < 801) {
return this.postData.StartDate;
}
else{
return this.dateControlStart.value;
}
}
get dateEnd () {
return this.dateControlEnd.value
if( window.innerWidth < 801) {
return this.postData.EndDate;
}
else{
return this.dateControlEnd.value;
}
}
@ViewChild('picker') picker: any;
@@ -182,9 +192,8 @@ export class BookMeetingModalPage implements OnInit {
Categories: null,
HasAttachments: true,
}
console.log(this.postData);
console.log(this.task);
if(this.task.FsId == '8') {
@@ -220,10 +229,8 @@ export class BookMeetingModalPage implements OnInit {
await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise();
break;
}
this.toastService.successMessage('Reunião criada', ()=>{
this.close();
})
this.close();
this.toastService.successMessage('Reunião criada');
} catch (error) {
this.toastService.badRequest()
src/app/pages/gabinete-digital/gabinete-digital.page.html
+1 -1
View File
@@ -115,7 +115,7 @@
</div>
</div>
<div *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorAssinar'" [class.active]="selectedElement == 'DiplomasPorAssinar'" class="exp-card d-flex flex-column justify-center">
<div *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'" [class.active]="selectedElement == 'DiplomasPorValidar'" class="exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-diploma.svg"></ion-icon>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+59 -14
View File
@@ -98,6 +98,7 @@ export class GabineteDigitalPage implements OnInit {
}
};
this.checkRoutes();
this.checkUser();
}
@@ -111,14 +112,6 @@ export class GabineteDigitalPage implements OnInit {
ngOnInit() {
switch(this.loggeduser.Profile){
case 'MDGPR':
this.showExpedients = true;
break;
case 'PR':
this.showExpedientesPr = true;
break;
}
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
this.checkRoutes();
@@ -129,6 +122,17 @@ export class GabineteDigitalPage implements OnInit {
this.hideRefreshButton();
}
checkUser(){
switch(this.loggeduser.Profile){
case 'MDGPR':
this.showExpedients = true;
break;
case 'PR':
this.showExpedientesPr = true;
break;
}
}
hideRefreshButton(){
window.onresize = (event) => {
if( window.innerWidth < 801) {
@@ -139,13 +143,54 @@ export class GabineteDigitalPage implements OnInit {
}
}
if(window.innerWidth < 801){
console.log('YASS');
this.hideRefreshBtn = false;
}
}
checkRoutes(){
this.activatedRoute.queryParams.subscribe(params => {
if(this.router.url == '/home/gabinete-digital?eventos=true'){
this.openEventsToApprovePage("MDGPR");
this.selectedElement='approval';
}
else if(this.router.url == '/home/gabinete-digital?expedientes=true'){
this.openExpedientListPage();
if(this.loggeduser.Profile == 'MDGPR'){
this.selectedElement='Correspondence';
}
else{
this.selectedElement='Expediente Presidente'
}
}
else if(this.router.url == '/home/gabinete-digital?pendentes=true'){
this.openPendentesPage('');
this.selectedElement='Pending';
}
else if(this.router.url == '/home/gabinete-digital?despachos=true'){
this.openDespachosPage('');
this.selectedElement='Dispatches';
}
else if(this.router.url == '/home/gabinete-digital?pedidos=true'){
this.openPedidosPage('parecer');
this.selectedElement='RequestsForOpinion';
}
else if(this.router.url == '/home/gabinete-digital?expedientespr=true'){
this.openExpedientesPrPage();
this.selectedElement='Expediente Presidente'
}
else if(this.router.url == '/home/gabinete-digital?despachospr=true'){
this.openDespachosPrPage('');
this.selectedElement='DispatchesPr'
}
else if(this.router.url == '/home/gabinete-digital?diplomas=true'){
this.openDiplomasPage('validar');
this.selectedElement='DiplomasPorValidar';
}
else if(this.router.url == '/home/gabinete-digital?diplomasassinar=true'){
this.openDiplomasPage('');
this.selectedElement='DiplomasAssinar';
}
/* this.activatedRoute.queryParams.subscribe(params => {
switch (params)
{
case params["eventos"]:
@@ -185,8 +230,8 @@ export class GabineteDigitalPage implements OnInit {
break;
case params["diplomas"]:
this.openDiplomasPage('');
this.selectedElement='DiplomasPorAssinar';
this.openDiplomasPage('validar');
this.selectedElement='DiplomasPorValidar';
break;
case params["diplomasassinar"]:
@@ -194,7 +239,7 @@ export class GabineteDigitalPage implements OnInit {
this.selectedElement='DiplomasAssinar';
break;
}
});
}); */
}
refreshExpedientes(){
@@ -429,7 +474,7 @@ export class GabineteDigitalPage implements OnInit {
}
else {
this.selectedElement='ExpedientesPr'
let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,}};
let navigationExtras: NavigationExtras = { queryParams: {"expedientespr": true,}};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
this.showExpedientesPr = true;
}