fix eye position

This commit is contained in:
Peter Maquiran
2024-02-29 22:47:42 +01:00
13 changed files with 76 additions and 38 deletions
+1
View File
@@ -24,6 +24,7 @@ def capacitor_pods
pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share' pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share'
pod 'CapacitorStorage', :path => '../../node_modules/@capacitor/storage' pod 'CapacitorStorage', :path => '../../node_modules/@capacitor/storage'
pod 'CapawesomeCapacitorFilePicker', :path => '../../node_modules/@capawesome/capacitor-file-picker' pod 'CapawesomeCapacitorFilePicker', :path => '../../node_modules/@capawesome/capacitor-file-picker'
pod 'CapawesomeCapacitorScreenOrientation', :path => '../../node_modules/@capawesome/capacitor-screen-orientation'
pod 'SentryCapacitor', :path => '../../node_modules/@sentry/capacitor' pod 'SentryCapacitor', :path => '../../node_modules/@sentry/capacitor'
pod 'TeamhiveCapacitorVideoRecorder', :path => '../../node_modules/@teamhive/capacitor-video-recorder' pod 'TeamhiveCapacitorVideoRecorder', :path => '../../node_modules/@teamhive/capacitor-video-recorder'
pod 'CapacitorVideoPlayer', :path => '../../node_modules/capacitor-video-player' pod 'CapacitorVideoPlayer', :path => '../../node_modules/capacitor-video-player'
@@ -275,7 +275,7 @@
<div class="list-people flex-grow-1"> <div class="list-people flex-grow-1">
<ion-item lines="none"> <ion-item lines="none">
<ion-list> <ion-list>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label> <ion-label *ngIf="taskParticipantsCc?.length < 1" 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>
@@ -638,14 +638,14 @@ export class EditEventPage implements OnInit {
} }
ajustMinuts(string) { ajustMinuts(string) {
var data = new Date(string); var partes = string.split(' ');
if (data.getMinutes() === 59) { var horaMinuto = partes[1].split(':');
data.setMinutes(0); if (horaMinuto[1] === '59') {
var novaString = data.toISOString().slice(0, 16).replace("T", " "); horaMinuto[1] = '00';
var novaString = partes[0] + ' ' + horaMinuto.join(':');
return novaString; return novaString;
} else {
return string;
} }
} return string;
}
} }
@@ -8,6 +8,18 @@
<div class="attachment" > <div class="attachment" >
<div class="attach-title-item tex-left d-flex "> <div class="attach-title-item tex-left d-flex ">
<div *ngIf="!isSelectedAttachmentIsDraft(attachment)" (click)="clickDocument(attachment, i )">
<button mat-icon-button aria-label="Example icon-button with a menu">
<ion-icon src="assets/icon/iconmonstr-eye-9.svg" class=" font-25-em "></ion-icon>
</button>
</div>
<div *ngIf="isSelectedAttachmentIsDraft(attachment)" (click)="clickDraft(i )">
<button mat-icon-button aria-label="Example icon-button with a menu">
<ion-icon src="assets/icon/iconmonstr-eye-9.svg" class=" font-25-em "></ion-icon>
</button>
</div>
<div> <div>
<div class="subject" [ngClass]="{'add-ellipsis': i != selectedIndex}">{{ attachment.Assunto || "Sem assunto" }}</div> <div class="subject" [ngClass]="{'add-ellipsis': i != selectedIndex}">{{ attachment.Assunto || "Sem assunto" }}</div>
<div class="user" > <div class="user" >
@@ -15,19 +27,10 @@
</div> </div>
</div> </div>
<span class="document-type ml-20" (click)="clickDraft(i)" *ngIf="isSelectedAttachmentIsDraft(attachment)">Rascunho</span> <span class="document-type ml-20" (click)="clickDraft(i)" *ngIf="isSelectedAttachmentIsDraft(attachment)" style="max-height: 33px;">Rascunho</span>
<br *ngIf="isSelectedAttachmentIsDraft(attachment)"> <br *ngIf="isSelectedAttachmentIsDraft(attachment)">
<div class="date d-flex justify-content-between" > <div class="date d-flex justify-content-between" >
<div *ngIf="!isSelectedAttachmentIsDraft(attachment)" (click)="clickDocument(attachment, i )">
<button mat-icon-button aria-label="Example icon-button with a menu">
<ion-icon src="assets/images/icons-nav-actions.svg" class=" font-25-em "></ion-icon>
</button>
</div>
<div *ngIf="isSelectedAttachmentIsDraft(attachment)" (click)="clickDraft(i )">
<button mat-icon-button aria-label="Example icon-button with a menu">
<ion-icon src="assets/images/icons-nav-actions.svg" class=" font-25-em "></ion-icon>
</button>
</div>
<div *ngIf="!isSelectedAttachmentIsDraft(attachment)"> <div *ngIf="!isSelectedAttachmentIsDraft(attachment)">
<button (click)="doSomething($event);" mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu"> <button (click)="doSomething($event);" mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu">
<mat-icon>more_vert</mat-icon> <mat-icon>more_vert</mat-icon>
@@ -5,6 +5,7 @@
width: 100%; width: 100%;
color:#0d89d1; color:#0d89d1;
padding-bottom: 5px; padding-bottom: 5px;
text-wrap: nowrap;
} }
/* SPAN */ /* SPAN */
.user{ .user{
@@ -26,6 +27,10 @@
.subject { .subject {
max-width: 230px; max-width: 230px;
} }
ion-icon {
color: black;
}
} }
iframe { iframe {
@@ -37,12 +42,12 @@ iframe {
.selected-attachment { .selected-attachment {
border: 3px solid #ffb703 !important; border: 3px solid #ffb703 !important;
color: #3498db !important; color: #3498db !important;
.user, .date { .user, .date, ion-icon {
color: #3498db !important; color: #3498db !important;
} }
.subject { .subject {
max-width: unset !important; max-width: 300px !important;
} }
} }
@@ -107,8 +107,8 @@ export class EditEventPage implements OnInit {
ngOnInit() { ngOnInit() {
this._postEvent = this.postEvent this._postEvent = this.postEvent
this.postEvent.StartDate = new Date(this.ajustMinuts(this.postEvent.StartDate))
console.log({_postEvent: this._postEvent}) this.postEvent.EndDate = new Date(this.ajustMinuts(this.postEvent.EndDate))
if(!this.restoreTemporaryData()) { if(!this.restoreTemporaryData()) {
// clear // clear
@@ -584,4 +584,16 @@ export class EditEventPage implements OnInit {
} }
ajustMinuts(string) {
var partes = string.split(' ');
var horaMinuto = partes[1].split(':');
if (horaMinuto[1] === '59') {
horaMinuto[1] = '00';
var novaString = partes[0] + ' ' + horaMinuto.join(':');
return novaString;
}
return string;
}
} }
@@ -331,5 +331,6 @@ ion-button{
.activity-instanceName { .activity-instanceName {
span { span {
text-wrap: nowrap; text-wrap: nowrap;
white-space: nowrap;
} }
} }
@@ -2,11 +2,11 @@
<div class="width-100"> <div class="width-100">
<div class="d-flex width-100"> <div class="d-flex width-100">
<div class="flex-grow-1 flex-wrap d-flex"> <div class="flex-grow-1 flex-wrap d-flex">
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Enviar para o {{ environment.PR}} </button> <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButonText" shape="round"> Enviar para o {{ environment.PR}} </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button> <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Solicitar revisão </button> <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButonText" shape="round"> Solicitar revisão </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Submeter para revisão</button> <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Submeter para revisão</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round">Outras opções </button> <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButonText" shape="round">Outras opções </button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button> <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<!-- <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button> --> <!-- <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button> -->
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button> <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
@@ -64,3 +64,9 @@
background-color: white; background-color: white;
color: var(--profile-text-color); color: var(--profile-text-color);
} }
.deskButonText{
text-align: left;
background-color: transparent;
color: var(--profile-text-color);
}
@@ -8,11 +8,11 @@
<div class="width-100"> <div class="width-100">
<div class="d-flex width-100"> <div class="d-flex width-100">
<div class="flex-grow-1 flex-wrap d-flex"> <div class="flex-grow-1 flex-wrap d-flex">
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Enviar para o {{ environment.PR}} </button> <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButtonText" shape="round"> Enviar para o {{ environment.PR}} </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button> <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Solicitar revisão </button> <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButtonText" shape="round"> Solicitar revisão </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Submeter para revisão</button> <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Submeter para revisão</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round">Outras opções </button> <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButtonText" shape="round">Outras opções </button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button> <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<!-- <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button> --> <!-- <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button> -->
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button> <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
@@ -64,3 +64,9 @@
background-color: white; background-color: white;
color: var(--profile-text-color); color: var(--profile-text-color);
} }
.deskButtonText{
text-align: left;
background-color: transparent;
color: var(--profile-text-color);
}
@@ -73,7 +73,7 @@ export class NewActionPage implements OnInit {
} }
/* get dateValid() { get dateValid() {
var validado: boolean; var validado: boolean;
if (window.innerWidth <= 800) { if (window.innerWidth <= 800) {
@@ -86,16 +86,19 @@ export class NewActionPage implements OnInit {
} else { } else {
return ['ok'] return ['ok']
} }
} */
get dateValid() {
return new Date(this.folder.DateBegin).getTime() < new Date(this.folder.DateBegin).getTime() ? 'ok': null
} }
/* get dateValid() {
return new Date(this.folder.DateBegin).getTime() < new Date(this.folder.DateBegin).getTime() ? 'ok': null
} */
runValidation() { runValidation() {
this.validateFrom = true; this.validateFrom = true;
if((new Date(this.folder.DateBegin).getTime()) > (new Date(this.folder.DateEnd).getTime())) { console.log(this.folder.DateBegin)
console.log(this.folder.DateEnd)
if(this.folder.DateBegin > this.folder.DateEnd) {
this.toastService._badRequest("A data de início não pode ser superior a data de fim"); this.toastService._badRequest("A data de início não pode ser superior a data de fim");
return false
} }
} }
@@ -117,13 +120,13 @@ export class NewActionPage implements OnInit {
async save() { async save() {
alert('hererr')
this.injectValidation() this.injectValidation()
this.runValidation() this.runValidation()
if(this.Form.invalid) return false if(this.Form.invalid) return false
alert('hererr 222')
this.folder = { this.folder = {
ProcessId: null, ProcessId: null,
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15 12c0 1.654-1.346 3-3 3s-3-1.346-3-3 1.346-3 3-3 3 1.346 3 3zm9-.449s-4.252 8.449-11.985 8.449c-7.18 0-12.015-8.449-12.015-8.449s4.446-7.551 12.015-7.551c7.694 0 11.985 7.551 11.985 7.551zm-7 .449c0-2.757-2.243-5-5-5s-5 2.243-5 5 2.243 5 5 5 5-2.243 5-5z"/></svg>

After

Width:  |  Height:  |  Size: 358 B