peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Peter Maquiran
2022-05-02 14:36:08 +01:00
parent 7862cfb1df 07e15647c6
commit 4d43bab686
157 changed files with 1076 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+1 -1
View File
@@ -272,7 +272,7 @@ export class BookMeetingModalPage implements OnInit {
}
console.log(this.EventRecurrenceType)
if(this.task.FsId == '8') {
const loader = this.toastService.loading()
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+12 -13
View File
@@ -114,7 +114,7 @@ export class ExpedientTaskModalPage implements OnInit {
this.loggeduser = userAuth.ValidatedUser;
this.task = this.navParams.get('task');
console.log('create dispatch with this data', this.task);
this.SearchFolder = this.navParams.get('SearchFolder');
this.aplicationId = this.navParams.get('aplicationId')
@@ -145,7 +145,7 @@ export class ExpedientTaskModalPage implements OnInit {
this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
this.profile = this.navParams.get('profile');
console.log(this.postData);
}
async setAdding(type: "intervenient" | "CC") {
@@ -163,9 +163,9 @@ export class ExpedientTaskModalPage implements OnInit {
}
onSelectedTypesChanged(ev:any) {
console.log(ev);
if(ev.length > 1){
console.log(ev.filter(data => data != '99999850'));
this.selectedTypes = ev.filter(data => data != '99999850');
}
if(ev.length == 0){
@@ -180,7 +180,7 @@ export class ExpedientTaskModalPage implements OnInit {
getSubjectType() {
this.processes.GetSubjectType().subscribe(res=>{
console.log(res);
this.subjectTypes = res;
});
}
@@ -322,7 +322,7 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
console.log(this.postData);
try {
@@ -336,7 +336,7 @@ export class ExpedientTaskModalPage implements OnInit {
loader.remove()
}
console.log('this.taskResult', this.taskResult);
break;
case '1': // Parecer
@@ -380,7 +380,7 @@ export class ExpedientTaskModalPage implements OnInit {
DispatchFolder: this.dispatchFolder,
AttachmentList: docs
}
//console.log(this.postData);
//
let action_deferimento = {
"serialNumber": this.task.serialNumber,
"action": "Tratado",
@@ -401,7 +401,7 @@ export class ExpedientTaskModalPage implements OnInit {
loader.remove()
}
console.log('this.taskResult', this.taskResult);
break;
}
}
@@ -421,7 +421,7 @@ export class ExpedientTaskModalPage implements OnInit {
DispatchFolder: this.dispatchFolder,
AttachmentList: docs,
}
console.log(this.postData);
let action_despacho_pr = {
"serialNumber": this.task.serialNumber,
@@ -491,7 +491,7 @@ export class ExpedientTaskModalPage implements OnInit {
getAttachments() {
this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{
this.loadedAttachments = res;
console.log(res);
});
}
@@ -568,7 +568,7 @@ export class ExpedientTaskModalPage implements OnInit {
}
async viewExpedientDetail() {
console.log(this.profile);
let classs;
if( window.innerWidth <= 800){
@@ -588,7 +588,6 @@ export class ExpedientTaskModalPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then((res)=>{
/* console.log('!refresh list'); */
});
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+2 -2
View File
@@ -92,8 +92,8 @@
<div class="aside-right flex-column height-100 overflow-y-auto">
<div class="buttons">
<div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="option-desc"> <div>Enviar para o PR</div> </div>
<button *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
<div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="option-desc"> <div *ngIf="loggeduser.Profile == 'MDGPR'">Enviar para o PR</div> </div>
<button *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks]) && loggeduser.Profile == 'MDGPR'" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Solicitar revisão</div> </div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) || p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="option-desc"> <div>Outras opções</div> </div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+21 -15
View File
@@ -32,6 +32,8 @@ import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
import { DataService } from 'src/app/services/data.service';
import { RouteService } from 'src/app/services/route.service';
import { Storage } from '@ionic/storage';
import { LoginUserRespose } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service';
@Component({
selector: 'app-expediente-detail',
@@ -61,6 +63,8 @@ export class ExpedienteDetailPage implements OnInit {
onlinecheck: boolean;
loggeduser: LoginUserRespose;
constructor(
private processes: ProcessesService,
private iab: InAppBrowser,
@@ -81,8 +85,10 @@ export class ExpedienteDetailPage implements OnInit {
private backgroundservice: BackgroundService,
public ThemeService: ThemeService,
private dataService: DataService,
private storage: Storage
private storage: Storage,
private userAuth: AuthService,
) {
this.loggeduser = userAuth.ValidatedUser
this.activatedRoute.paramMap.subscribe(params => {
if (params["params"].SerialNumber) {
this.serialNumber = params["params"].SerialNumber;
@@ -113,7 +119,7 @@ export class ExpedienteDetailPage implements OnInit {
updateProcessDB(res) {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.set('expediente_details',res).then(() =>{
console.log('EXPEDIENTE DETAILS SAVED')
})
} else {
this.sqliteservice.updateProcess(res)
@@ -163,7 +169,7 @@ export class ExpedienteDetailPage implements OnInit {
this.platform.ready().then(() => {
this.onlinecheck = false;
this.sqliteservice.getProcessById(this.serialNumber).then((process) => {
console.log("expedient ditail", process)
var workflow = JSON.parse(process[0].workflowInstanceDataFields);
var origina
@@ -227,7 +233,7 @@ export class ExpedienteDetailPage implements OnInit {
"AttachmentList": documents,
}
console.log(body);
const loader = this.toastService.loading()
@@ -287,7 +293,7 @@ export class ExpedienteDetailPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(res => {
console.log(res);
if (res.data) {
const DocumentToSave = res.data.documents.map((e) => {
return {
@@ -355,7 +361,7 @@ export class ExpedienteDetailPage implements OnInit {
sendExpedienteToPending() {
this.processes.SetTaskToPending(this.serialNumber).subscribe(res => {
console.log(res);
this.toastService._successMessage('Processo enviado para pendentes')
this.goBack();
},
@@ -367,7 +373,7 @@ export class ExpedienteDetailPage implements OnInit {
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
console.log(res);
this.task = {
"SerialNumber": res.serialNumber,
@@ -403,8 +409,8 @@ export class ExpedienteDetailPage implements OnInit {
});
})
console.log('this.task', this.task.InstanceID)
console.log('this.task.DocumentURL', this.fulltask)
}, (error) => {
@@ -460,11 +466,11 @@ export class ExpedienteDetailPage implements OnInit {
// }
getAttachments(serialNumber) {
console.log(serialNumber);
this.attachmentsService.getAttachmentsBySerial(serialNumber).subscribe(res => {
this.attachments = res;
console.log('res', res);
});
}
@@ -567,7 +573,7 @@ export class ExpedienteDetailPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(async (res) => {
console.log(res['data']);
if (body == 'descartar') {
if (res['data'] == 'Yes') {
@@ -605,7 +611,7 @@ export class ExpedienteDetailPage implements OnInit {
}
else if (res['data'] == 'No') {
console.log('Update');
const loader = this.toastService.loading()
try {
await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
@@ -622,7 +628,7 @@ export class ExpedienteDetailPage implements OnInit {
}
async openBookMeetingModal(task: any) {
console.log(task);
let classs;
if (window.innerWidth < 701) {
@@ -649,7 +655,7 @@ export class ExpedienteDetailPage implements OnInit {
}
async viewEventDetail(eventId: any) {
console.log(this.profile);
const modal = await this.modalController.create({
component: ViewEventPage,
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+4 -4
View File
@@ -82,7 +82,7 @@ export class ExpedientePage implements OnInit {
this.addProcessTODb(task);
});
this.listToPresent = this.sortService.sortDate(this.taskslist, 'taskStartDate')
console.log('expediente list', this.listToPresent)
this.skeletonLoader = false;
}, (error) => {
@@ -108,14 +108,14 @@ export class ExpedientePage implements OnInit {
}
goToExpediente(serialNumber: any) {
//console.log('ABRE');
//
this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']);
}
addProcessTODb(task) {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.set('gabinete-expediente',task).then(() => {
console.log('GABINETE EXPEDIENTE SAVED')
})
} else {
this.sqliteservice.addProcess(task);
@@ -131,7 +131,7 @@ export class ExpedientePage implements OnInit {
} else {
this.taskslist = new Array();
this.sqliteservice.getprocessByworkflow("Expediente").then((expediente: any[]) => {
console.log("All expedientes from local,", expediente)
expediente.forEach((element) => {