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

Improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-20 12:02:27 +01:00
parent edb1a5c9d9
commit 375eeda2ca
31 changed files with 258 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+2 -2
View File
@@ -4,7 +4,7 @@ import { AlertController, ModalController } from '@ionic/angular';
import * as moment from 'moment';
import { Attachment } from 'src/app/models/attachment.model';
import { EventPerson } from 'src/app/models/eventperson.model';
import { SearchDocument } from 'src/app/models/search-document';
import { SearchList } from 'src/app/models/search-document';
import { SearchPage } from 'src/app/pages/search/search.page';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
@@ -443,7 +443,7 @@ export class EditEventToApprovePage implements OnInit {
modal.onDidDismiss().then( async (res)=>{
if(res){
const data: SearchDocument = res.data.selected;
const data: SearchList = res.data.selected;
const DocumentToSave: any = {
SourceTitle: data.Assunto,
src/app/shared/agenda/new-event/new-event.page.ts
+3 -2
View File
@@ -7,7 +7,7 @@ import { Event } from 'src/app/models/event.model';
import { ModalController } from '@ionic/angular';
import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
import { SearchPage } from 'src/app/pages/search/search.page';
import { SearchDocument } from "src/app/models/search-document";
import { SearchList } from "src/app/models/search-document";
import { EventAttachment } from 'src/app/models/attachment.model';
import { ToastService } from 'src/app/services/toast.service';
@@ -86,7 +86,7 @@ export class NewEventPage implements OnInit {
@Output() GoBackEditOrAdd = new EventEmitter<any>();
@Output() cloneAllmobileComponent = new EventEmitter<any>();
documents:SearchDocument[] = [];
documents:SearchList[] = [];
// minDate: string;
@@ -448,6 +448,7 @@ export class NewEventPage implements OnInit {
const eventId: any = id;
const DocumentToSave: EventAttachment[] = this.documents.map((e) => {
return {
SourceTitle: e.Assunto,
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+2 -2
View File
@@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular';
import { Attachment } from 'src/app/models/attachment.model';
import { EventPerson } from 'src/app/models/eventperson.model';
import { SearchDocument } from 'src/app/models/search-document';
import { SearchList } from 'src/app/models/search-document';
import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
import { SearchPage } from 'src/app/pages/search/search.page';
import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -382,7 +382,7 @@ export class EditEventToApproveComponent implements OnInit {
modal.onDidDismiss().then( async (res)=>{
if(res){
const data: SearchDocument = res.data.selected;
const data: SearchList = res.data.selected;
const DocumentToSave: any = {
SourceTitle: data.Assunto,
src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+2 -2
View File
@@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { EventPerson } from 'src/app/models/eventperson.model';
import { SearchDocument } from 'src/app/models/search-document';
import { SearchList } from 'src/app/models/search-document';
import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page';
import { SearchPage } from 'src/app/pages/search/search.page';
import { AlertService } from 'src/app/services/alert.service';
@@ -14,7 +14,7 @@ import { environment } from 'src/environments/environment';
})
export class ChatOptionsPopoverPage implements OnInit {
documents:SearchDocument[] = [];
documents:SearchList[] = [];
members: any;
attendees: EventPerson[] = [];
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+5 -5
View File
@@ -235,19 +235,19 @@ export class DespachosPrOptionsPage implements OnInit {
Attachments: DocumentToSave,
}
if(actionName == 'Executado'){
if(actionName == 'Executado') {
await this.executado(res.data.note, docs);
}
else if(actionName == 'Arquivar'){
else if(actionName == 'Arquivar') {
await this.arquivar(res.data.note, docs);
}
else if(actionName == 'Gerar Diploma'){
else if(actionName == 'Gerar Diploma') {
await this.generateDiploma(res.data.note, docs);
}
else if(actionName == 'Reexecução'){
else if(actionName == 'Reexecução') {
await this.reexecutar(res.data.note, docs);
}
else if(actionName == 'Concluido'){
else if(actionName == 'Concluido') {
await this.concluir(res.data.note, docs);
}
this.goBack();
src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+2 -2
View File
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { SearchDocument } from 'src/app/models/search-document';
import { SearchList } from 'src/app/models/search-document';
import { User } from 'src/app/models/user.model';
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
@@ -32,7 +32,7 @@ export class OptsExpedientePrPage implements OnInit {
serialnumber: string;
profile: string;
documents:SearchDocument[] = [];
documents:SearchList[] = [];
attachments:any;
showEnviarPendentes = false;
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+3 -3
View File
@@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { customTask, expedienteTask, fullTask } from 'src/app/models/dailyworktask.model';
import { SearchDocument } from 'src/app/models/search-document';
import { expedienteTask } from 'src/app/models/dailyworktask.model';
import { SearchList } from 'src/app/models/search-document';
import { PermissionService } from 'src/app/OtherService/permission.service';
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
@@ -28,7 +28,7 @@ export class OptsExpedientePage implements OnInit {
showEnviarPendentes = false
searchDocumentPipe = new SearchDocumentPipe()
documents:SearchDocument[] = [];
documents:SearchList[] = [];
constructor(
private popoverController: PopoverController,