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

Merge branch 'developer' into developer_mobilefirst

Browse Source
This commit is contained in:
Eudes Inácio
2021-06-23 09:21:26 +01:00
parent a6dbd09473 c8ab514b10
commit 0d6aaa985f
67 changed files with 433 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+2 -11
View File
@@ -1176,17 +1176,8 @@ export class AgendaPage implements OnInit {
async viewEventsToApprove(){
await this.cloneAllmobileComponent()
if( window.innerWidth <= 1024){
const modal = await this.modalCtrl.create({
component: EventListPage,
componentProps:{
profile: this.profile,
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
if( window.innerWidth <= 801){
this.router.navigate(['/home/agenda/event-list']);
} else {
// hide all components
this.cloneAllmobileComponent();
src/app/pages/agenda/edit-event/edit-event.page.html
+2 -2
View File
@@ -144,7 +144,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -165,7 +165,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+2 -3
View File
@@ -70,7 +70,7 @@ export class EventActionsPopoverPage implements OnInit {
}
async emendarTask() {
console.log('Mobile');
this.closePopover();
const modal = await this.modalController.create({
component: EmendMessageModalPage,
@@ -122,8 +122,7 @@ export class EventActionsPopoverPage implements OnInit {
}
async editTask() {
console.log(this.serialNumber);
console.log(this.instanceId);
this.closePopover();
const modal = await this.modalController.create({
component: EditEventToApproveComponent,
componentProps: {
src/app/pages/agenda/new-event/new-event.page.html
+2 -2
View File
@@ -54,7 +54,7 @@
<div class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Selecione tipo"
@@ -135,7 +135,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar interveniente</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar interveniente</ion-label>
<div class="list-people">
<ion-item lines="none">
<ion-list>
src/app/pages/agenda/new-event/new-event.page.scss
+3
View File
@@ -210,4 +210,7 @@ ion-content{
.close-button {
display: block !important;
}
}
.icon-time{
color: #797979b0;
}
src/app/pages/agenda/new-event/new-event.page.ts
+1 -1
View File
@@ -76,7 +76,7 @@ export class NewEventPage implements OnInit {
Body: this.eventBody,
Location: '',
CalendarId: '',
CalendarName: this.selectedSegment,
CalendarName: '',
StartDate: selectedStartdDate,
EndDate: new Date(selectedEndDate),
EventType: 'Reunião',