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

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

Browse Source
This commit is contained in:
tiago.kayaya
2021-04-09 11:34:14 +01:00
parent 01626ad317 e8ba2b6426
commit 9dfc36e3fe
5 changed files with 195 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+4
View File
@@ -34,3 +34,7 @@ npm-debug.log*
# Custom # Custom
/android /android
/package-lock.json /package-lock.json
src/app/architect/
src/environments/environment.e2e.ts
src/app/pages/agenda/agenda.page.html
+1
View File
@@ -372,6 +372,7 @@
(setIntervenient)="setIntervenient($event)" (setIntervenient)="setIntervenient($event)"
(setIntervenientCC)="setIntervenientCC($event)" (setIntervenientCC)="setIntervenientCC($event)"
></app-new-event> ></app-new-event>
<!-- Edit --> <!-- Edit -->
<app-edit-event *ngIf="mobileComponent.showEditEvent" <app-edit-event *ngIf="mobileComponent.showEditEvent"
[taskParticipants]="taskParticipants" [taskParticipants]="taskParticipants"
src/app/pages/agenda/edit-event/edit-event.page.html
-2
View File
@@ -15,7 +15,6 @@
</div> </div>
<ion-item-sliding class="overflow-y-auto"> <ion-item-sliding class="overflow-y-auto">
<div class="px-20"> <div class="px-20">
<div class="ion-item-container width-100"> <div class="ion-item-container width-100">
<ion-input placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input> <ion-input placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
@@ -204,7 +203,6 @@
</div> </div>
<div hidden> <div hidden>
<ion-item> <ion-item>
<ion-label>Documentos Anexados</ion-label> <ion-label>Documentos Anexados</ion-label>
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+2 -2
View File
@@ -56,7 +56,7 @@
<div class="list-people"> <div class="list-people">
<ion-item lines="none"> <ion-item lines="none">
<ion-list> <ion-list>
<ion-label *ngIf="!taskParticipants && taskParticipants.length >= 1" class="list-people-title">Adicionar intervenientes</ion-label> <ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label> <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list> </ion-list>
</ion-item> </ion-item>
@@ -77,7 +77,7 @@
<div class="list-people"> <div class="list-people">
<ion-item lines="none"> <ion-item lines="none">
<ion-list> <ion-list>
<ion-label *ngIf="!taskParticipantsCc && taskParticipantsCc.length >= 1" class="list-people-title">Com conhecimento</ion-label> <ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Com conhecimento</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label> <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list> </ion-list>
</ion-item> </ion-item>
src/app/shared/agenda/new-event/new-event.component.ts
+6
View File
@@ -134,6 +134,9 @@ export class NewEventPage implements OnInit {
async addParticipants() { async addParticipants() {
this.saveTemporaryData();
this.openAttendeesComponent.emit({ this.openAttendeesComponent.emit({
type: "intervenient" type: "intervenient"
}); });
@@ -142,6 +145,9 @@ export class NewEventPage implements OnInit {
} }
async addParticipantsCc() { async addParticipantsCc() {
this.saveTemporaryData();
this.openAttendeesComponent.emit({ this.openAttendeesComponent.emit({
type: "CC" type: "CC"
}); });