mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-21 05:45:50 +00:00
Fix option
This commit is contained in:
@@ -42,10 +42,7 @@
|
|||||||
</ion-item>
|
</ion-item>
|
||||||
</ion-list>
|
</ion-list>
|
||||||
</div>
|
</div>
|
||||||
<ion-item hidden lines="none">
|
</div>
|
||||||
<ion-textarea [(ngModel)]="note" rows="4" cols="20" placeholder="Adicionar um comentário para execução..."></ion-textarea>
|
|
||||||
</ion-item>
|
|
||||||
</div>
|
|
||||||
</ion-content>
|
</ion-content>
|
||||||
<ion-footer class="ion-no-border">
|
<ion-footer class="ion-no-border">
|
||||||
<div class="buttons width-100">
|
<div class="buttons width-100">
|
||||||
|
|||||||
@@ -32,11 +32,11 @@ export class AddNotePage implements OnInit {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
close(){
|
close() {
|
||||||
this.modalController.dismiss('');
|
this.modalController.dismiss('');
|
||||||
}
|
}
|
||||||
|
|
||||||
save(){
|
save() {
|
||||||
let body = {
|
let body = {
|
||||||
"note":this.note,
|
"note":this.note,
|
||||||
"documents":this.documents,
|
"documents":this.documents,
|
||||||
|
|||||||
@@ -41,8 +41,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div hidden class="ion-item-container-no-border">
|
<div *ngIf="hideThisFeature" class="ion-item-container-no-border">
|
||||||
<ion-label>
|
<ion-label (click)="getDoc()">
|
||||||
<div class="attach-icon">
|
<div class="attach-icon">
|
||||||
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
|
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
@@ -52,20 +52,25 @@
|
|||||||
</ion-label>
|
</ion-label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="loadedAttachments">
|
<div class="content width-100 overflow-y-auto height-100">
|
||||||
|
<div class="list">
|
||||||
|
<ion-list *ngFor="let document of documents; let i = index">
|
||||||
<ion-item>
|
<ion-item>
|
||||||
<ion-label>Documentos Anexados</ion-label>
|
|
||||||
</ion-item>
|
|
||||||
<ion-list>
|
|
||||||
<ion-item *ngFor="let attachment of loadedAttachments">
|
|
||||||
<ion-label>
|
<ion-label>
|
||||||
<h4 class="attach-title-item">{{attachment.Description}}</h4>
|
<p class="d-flex ion-justify-content-between">
|
||||||
<p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right"> {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}</span></p>
|
<span class="attach-title-item">{{document.Assunto}}</span>
|
||||||
|
<span class="app-name">{{document.appName}}</span>
|
||||||
|
<span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
|
||||||
|
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||||
</ion-label>
|
</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</ion-list>
|
</ion-list>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p
|
|||||||
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
|
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
|
||||||
import { ToastService } from 'src/app/services/toast.service';
|
import { ToastService } from 'src/app/services/toast.service';
|
||||||
import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
|
import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
|
||||||
|
import { SearchDocument } from 'src/app/models/search-document';
|
||||||
|
import { SearchPage } from 'src/app/pages/search/search.page';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-delegar',
|
selector: 'app-delegar',
|
||||||
@@ -38,6 +40,9 @@ export class DelegarPage implements OnInit {
|
|||||||
formLocationSatus: boolean = false;
|
formLocationSatus: boolean = false;
|
||||||
showAttendees= false;
|
showAttendees= false;
|
||||||
|
|
||||||
|
hideThisFeature: boolean = true;
|
||||||
|
documents: SearchDocument[] = [];
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private modalController: ModalController,
|
private modalController: ModalController,
|
||||||
private router:Router,
|
private router:Router,
|
||||||
@@ -63,6 +68,7 @@ export class DelegarPage implements OnInit {
|
|||||||
let selectedEndDate = new Date();
|
let selectedEndDate = new Date();
|
||||||
/* this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */
|
/* this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */
|
||||||
|
|
||||||
|
this.hideThisFeature = this.navParams.get('showAttachmentBtn');
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
@@ -187,4 +193,32 @@ export class DelegarPage implements OnInit {
|
|||||||
this.taskParticipants = taskParticipants;
|
this.taskParticipants = taskParticipants;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async getDoc() {
|
||||||
|
|
||||||
|
const modal = await this.modalController.create({
|
||||||
|
component: SearchPage,
|
||||||
|
cssClass: 'modal-width-100-width-background modal',
|
||||||
|
componentProps: {
|
||||||
|
type: 'AccoesPresidenciais & ArquivoDespachoElect',
|
||||||
|
showSearchInput: true,
|
||||||
|
select: true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
await modal.present();
|
||||||
|
modal.onDidDismiss().then((res)=>{
|
||||||
|
if(res){
|
||||||
|
const data = res.data;
|
||||||
|
this.documents.push(data.selected);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
removeAttachment(index: number){
|
||||||
|
|
||||||
|
this.documents = this.documents.filter( (e, i) => index != i);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -8,8 +8,6 @@ import { momentG } from 'src/plugin/momentG';
|
|||||||
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
|
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
|
||||||
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
|
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
|
||||||
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
|
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
|
||||||
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
|
|
||||||
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
|
|
||||||
import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
|
import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
|
||||||
import { ToastService } from 'src/app/services/toast.service';
|
import { ToastService } from 'src/app/services/toast.service';
|
||||||
import { Location } from '@angular/common';
|
import { Location } from '@angular/common';
|
||||||
|
|||||||
@@ -202,7 +202,8 @@ export class DespachosPrOptionsPage implements OnInit {
|
|||||||
}
|
}
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: AddNotePage,
|
component: AddNotePage,
|
||||||
componentProps:{
|
componentProps: {
|
||||||
|
showAttachmentBtn: true
|
||||||
},
|
},
|
||||||
cssClass: classs,
|
cssClass: classs,
|
||||||
backdropDismiss: true
|
backdropDismiss: true
|
||||||
|
|||||||
Reference in New Issue
Block a user