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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into release/uats

Browse Source
This commit is contained in:
tiago.kayaya
2021-12-13 15:39:50 +01:00
parent 25d9aefa9d e524062ed9
commit 57a781cdfe
9 changed files with 112 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/new-event/new-event.page.ts
+6 -3
View File
@@ -180,7 +180,10 @@ export class NewEventPage implements OnInit {
runValidation() {
this.validateFrom = true
this.validateFrom = true;
if(new Date(this.postEvent.StartDate).getTime() > new Date(this.postEvent.EndDate).getTime()){
this.toastService._badRequest("A data de fim não pode ser inferior a data de início do evento")
}
}
@@ -316,14 +319,14 @@ export class NewEventPage implements OnInit {
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
if(newAttendees.length) {
this.setIntervenient(newAttendees);
}
if(newAttendeesCC) {
this.setIntervenientCC(newAttendeesCC);
}
}
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+6 -5
View File
@@ -432,7 +432,7 @@ export class ExpedienteDetailPage implements OnInit {
component: SearchPage,
cssClass: 'modal-width-100-width-background modal',
componentProps: {
type: 'AccoesPresidenciais & ArquivoDespachoElect',
type: 'Correspondencia',
showSearchInput: true,
select: true,
findOnly: [8]
@@ -458,7 +458,7 @@ export class ExpedienteDetailPage implements OnInit {
body.Attachments = Attachments;
const loader = this.toastService.loading()
try {
loader.remove()
await this.attachmentsService.AddAttachment(body).toPromise()
@@ -467,11 +467,12 @@ export class ExpedienteDetailPage implements OnInit {
this.toastService._badRequest()
}
});
this.LoadTaskDetail(this.serialNumber);
}
});
setTimeout(() => {
this.LoadTaskDetail(this.serialNumber);
}, 5000);
});
}
async openExpedientActionsModal(taskAction: any, task: any) {
src/app/pages/search/search.page.html
+3 -3
View File
@@ -177,10 +177,10 @@
<ul>
<li *ngFor="let searchDocument of showSearchDocuments" (click)="viewDetail( searchDocument); selectItem(searchDocument)" class="d-flex cursor-pointer">
<div class="icon">
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' && ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' || itemIcons() == 'Correspondencia' && ThemeService.currentTheme == 'default' "
src="assets/images/icons-search-document.svg"></ion-icon>
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' && ThemeService.currentTheme == 'gov'"
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' || itemIcons() == 'Correspondencia' && ThemeService.currentTheme == 'gov'"
src="assets/images/theme/gov/icons-search-document.svg"></ion-icon>
<ion-icon *ngIf="itemIcons() == 'Agenda' "
@@ -192,7 +192,7 @@
<div class="d-flex ion-justify-content-between ">
<span class="result-name">{{ searchDocument.Assunto}}</span>
<span class="app-name" *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' ">{{ searchDocument.appName}}</span>
<span class="app-name" *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' || itemIcons() == 'Correspondencia' ">{{ searchDocument.appName}}</span>
</div>
<div class="d-flex ion-justify-content-between ">
<span class="organic-entity">{{ searchDocument.EntidadeOrganicaNome }}</span>
src/app/pages/search/search.page.ts
+87 -4
View File
@@ -243,7 +243,8 @@ export class SearchPage implements OnInit {
this.loadWordCloud();
});
} else if ( this.type == "AccoesPresidenciais & ArquivoDespachoElect"){
}
else if ( this.type == "AccoesPresidenciais & ArquivoDespachoElect"){
this.showLoader = true;
@@ -319,7 +320,7 @@ export class SearchPage implements OnInit {
});
} else {
let counter = 0;
let counter = 0;
this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
@@ -385,11 +386,93 @@ export class SearchPage implements OnInit {
}
this.loadWordCloud();
});
}
}
} else if (this.type == "AccoesPresidenciais"){
else if ( this.type == "Correspondencia"){
this.showLoader = true;
this.searchCategories = [];
this.searchDocuments = [];
this.showSearchDocuments = [];
if(this.select) {
let counter = 0;
this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
res.Categories.forEach( e => {
e['Active'] = false;
this.searchCategories.push(e)
});
// bind respose
this.sortArrayISODate(res.Documents).forEach(e => {
e['appName'] = 'Correspondencia'
this.searchDocuments.push(e)
});
this.reorderList(this.ordinance);
// hide show document
if(this.searchDocuments.length >= 1){
this.showDocuments = true;
} else {
this.showDocuments = false
}
counter++;
if(counter ==2){
this.showLoader = false;
}
this.showLoader = false;
this.loadWordCloud();
});
} else {
let counter = 0;
this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
res.Categories.forEach( e => {
e['Active'] = false;
this.searchCategories.push(e)
});
// bind respose
this.sortArrayISODate(res.Documents).forEach(e => {
e['appName'] = 'Correspondencia'
this.searchDocuments.push(e)
});
this.reorderList(this.ordinance);
// hide show document
if(this.searchDocuments.length >= 1){
this.showDocuments = true;
} else {
this.showDocuments = false
}
counter++;
if(counter ==2){
this.showLoader = false;
}
this.loadWordCloud();
});
}
}
else if (this.type == "AccoesPresidenciais"){
this.showLoader = true;
src/app/services/functions/file.service.ts
-1
View File
@@ -54,7 +54,6 @@ export class FileService {
) { }
uploadFile(formData:any){
alert('OIEE')
//const geturl = environment.apiURL + 'Tasks/DelegateTask';
const geturl = environment.apiURL + 'lakefs/UploadFiles';
src/app/services/processes.service.ts
-1
View File
@@ -44,7 +44,6 @@ export class ProcessesService {
}
uploadFile(formData:any){
alert('OIEE')
//const geturl = environment.apiURL + 'Tasks/DelegateTask';
const geturl = environment.apiURL + 'lakefs/UploadFiles';
src/app/shared/agenda/new-event/new-event.page.ts
+6 -3
View File
@@ -218,7 +218,10 @@ export class NewEventPage implements OnInit {
}
runValidation() {
this.validateFrom = true
this.validateFrom = true;
if(new Date(this.postEvent.StartDate).getTime() > new Date(this.postEvent.EndDate).getTime()){
this.toastService._badRequest("A data de fim não pode ser inferior a data de início do evento")
}
}
injectValidation() {
@@ -227,7 +230,7 @@ export class NewEventPage implements OnInit {
const str: any = this.postEvent.EventRecurrence.Type.toString()
this.postEvent.EventRecurrence.Type = str
}
this.Form = new FormGroup({
Subject: new FormControl(this.postEvent.Subject, [
Validators.required,
@@ -255,8 +258,8 @@ export class NewEventPage implements OnInit {
Date: new FormControl( new Date(this.postEvent.StartDate).getTime() < new Date(this.postEvent.EndDate).getTime() ? 'ok': null,[
Validators.required
]),
})
}
src/app/shared/chat/group-messages/group-messages.page.html
+2 -2
View File
@@ -148,11 +148,11 @@
</ion-fab-button>
<!-- <ion-fab-button (click)="addFile()" color="light">
<ion-icon name="document"></ion-icon>
</ion-fab-button>
</ion-fab-button> -->
<ion-fab-button (click)="addImage()" color="light">
<ion-icon name="image"></ion-icon>
</ion-fab-button>
<ion-fab-button class="hide-desktop" (click)="takePicture()" color="light">
<!-- <ion-fab-button class="hide-desktop" (click)="takePicture()" color="light">
<ion-icon name="camera"></ion-icon>
</ion-fab-button> -->
<ion-fab-button (click)="addFileWebtrix()" color="light">
src/app/shared/chat/messages/messages.page.html
+2 -2
View File
@@ -122,11 +122,11 @@
</ion-fab-button>
<!-- <ion-fab-button hidden (click)="addFile()" color="light">
<ion-icon name="document"></ion-icon>
</ion-fab-button>
</ion-fab-button> -->
<ion-fab-button (click)="addImage()" color="light">
<ion-icon name="image"></ion-icon>
</ion-fab-button>
<ion-fab-button (click)="takePicture()" color="light">
<!-- <ion-fab-button (click)="takePicture()" color="light">
<ion-icon name="camera"></ion-icon>
</ion-fab-button> -->
<ion-fab-button (click)="addFileWebtrix()" color="light">