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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2023-02-06 11:38:15 +01:00
parent 092f5f7f6f
commit 009f2fa928
3 changed files with 18 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+5 -63
View File
@@ -8,7 +8,7 @@
<!-- *ngIf="p.userRole('PR')" -->
<!-- *ngIf="p.role(['PR','MD']).permissionAnyOf(['view','edit'])" -->
<label >Convocar Reunião</label>
<label >Convocar Reunião /././</label>
</div>
</div>
<div class="overflow-y-auto content-default-padding">
@@ -78,20 +78,8 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class" >
<ion-select
class="d-block d-md-none"
[(ngModel)]="postData.CalendarName"
placeholder="Selecione repetição"
interface="action-sheet"
Cancel-text="Cancelar" required
(selectionChange)="changeAgenda()"
>
<ion-select-option value="Oficial">Oficial</ion-select-option>
<ion-select-option value="Pessoal">Pessoal</ion-select-option>
</ion-select>
<mat-form-field floatLabel="never" appearance="none" class="d-none d-md-block width-100">
<mat-form-field floatLabel="never" appearance="none" class="d-md-block width-100">
<mat-select placeholder="Selecione agenda" [(ngModel)]="postData.CalendarName" >
<mat-option value="Oficial">
Oficial
@@ -114,19 +102,8 @@
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid && validateFrom ">
<ion-select placeholder="Selecione tipo de evento*"
class="d-block d-md-none"
[(ngModel)]="postData.Category"
interface="action-sheet"
Cancel-text="Cancelar" required>
<ion-select-option value="Reunião">Reunião</ion-select-option>
<ion-select-option value="Viagem">Viagem</ion-select-option>
<ion-select-option value="Conferência">Conferência</ion-select-option>
<ion-select-option value="Encontro">Encontro</ion-select-option>
</ion-select>
<mat-form-field class="d-none d-md-block" appearance="none" class="width-100" placeholder="Sample Type" required>
<mat-form-field class="d-md-block" appearance="none" class="width-100" placeholder="Sample Type" required>
<!-- <input matInput type="text" > -->
<mat-select [(ngModel)]="postData.Category" >
<mat-option value="Reunião">
@@ -144,7 +121,6 @@
</mat-select>
</mat-form-field>
</div>
</div>
</div>
@@ -155,17 +131,8 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<ion-datetime
class="d-block d-md-none"
placeholder="Início*"
[(ngModel)]="postData.StartDate"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,30"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
value="2020-11-19T11:06Z">
</ion-datetime>
<mat-form-field appearance="none" class="width-100 date-hour-picker d-md-block">
<mat-form-field appearance="none" class="width-100 date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Início*"
[(ngModel)]="postData.StartDate"
@@ -191,17 +158,8 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<ion-datetime
class="d-block d-md-none"
placeholder="Início*"
[(ngModel)]="postData.EndDate"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,30"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
value="2020-11-19T11:06Z">
</ion-datetime>
<mat-form-field appearance="none" class="date-hour-picker width-100 d-none d-md-block">
<mat-form-field appearance="none" class="date-hour-picker width-100 ">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Fim*"
[(ngModel)]="postData.EndDate"
@@ -227,11 +185,7 @@
</div>
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('dateOccurrence')?.invalid && validateFrom ">
<<<<<<< HEAD
=======
>>>>>>> develop_bitOut-fix
<mat-form-field appearance="none" floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
<mat-select placeholder="Selecione repetição*"
[(ngModel)]="EventRecurrenceType"
@@ -255,18 +209,6 @@
</div>
<!-- (click)="openLastOccurrence()" -->
<div class="ion-input-class flex-grow-1">
<!-- <ion-datetime
placeholder="Última ocorrência"
[(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
displayFormat="DD MMM YYYY"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="2021"
max="2045"
>
</ion-datetime> -->
<!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
<!-- [formControl]="dateControlOccurrence" -->
<mat-form-field class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="occurrrence"
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+7 -4
View File
@@ -121,7 +121,6 @@ export class DocumentSetUpMeetingPage implements OnInit {
if(!this.CalendarName) {
if(this._eventService.calendarNamesAry.includes('Meu calendario')) {
this.CalendarName = 'Meu calendario';
console.log(this._eventService.calendarNamesAry)
} else {
this.CalendarName = this._eventService.calendarNamesAry[0]
}
@@ -141,6 +140,10 @@ export class DocumentSetUpMeetingPage implements OnInit {
this.adding = "intervenient";
this.setDefaultTime()
this.getRecurrenceTypes();
this.setStartDate();
this.setEndDate();
}
getRecurrenceTypes() {
@@ -279,8 +282,9 @@ export class DocumentSetUpMeetingPage implements OnInit {
laoder.remove()
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
} else if(error.error.includes('attachments')) {
throw(error.error + JSON.stringify(postEvent.Attachments))
} else {
this.toastService._badRequest('Não foi possível marcar a reunião');
}
}, ()=>{
@@ -374,7 +378,6 @@ export class DocumentSetUpMeetingPage implements OnInit {
modal.onDidDismiss().then((res)=> {
if(res){
const data = res.data;
console.log('data', data)
this.attachments.push(data.selected);
}
});
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "79b8b28ce",
"SHA": "79b8b28ce4be6d579994bd7b15b8137807223be9",
"shortSHA": "092f5f7f6",
"SHA": "092f5f7f6feec5064a7eb8c538d3e0a072bd602b",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Feb 6 10:49:58 2023 +0100'",
"lastCommitMessage": "Evento to approve",
"lastCommitNumber": "4729",
"lastCommitTime": "'Mon Feb 6 10:55:44 2023 +0100'",
"lastCommitMessage": "improve message",
"lastCommitNumber": "4730",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts",
"changeAuthor": "peter.maquiran"
}