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

Fix action

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-09 13:56:17 +01:00
parent 08c5a959d5
commit 8da233c1bc
14 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/document-detail/document-detail.page.html
+5 -4
View File
@@ -24,16 +24,17 @@
</div>
<div class="line"></div>
<div class="middle-content">
<h5>Intervenientes</h5>
<h5 >Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div>
<p>{{LoadedDocument.Interveners}}</p>
<p>{{LoadedDocument.Interveners || LoadedDocument.Sender}}</p>
</div>
</ion-label>
</ion-item>
<h5>Status</h5>
<ion-item class="ion-no-margin ion-no-padding">
<h5 *ngIf="LoadedDocument.ApplicationId == 361 || LoadedDocument.ApplicationID == 361">Status</h5>
<ion-item *ngIf="LoadedDocument.ApplicationId == 361 || LoadedDocument.ApplicationID == 361" class="ion-no-margin ion-no-padding">
<p >{{LoadedDocument.Status}}</p>
</ion-item>
</div>
src/app/modals/document-detail/document-detail.page.ts
+3 -1
View File
@@ -52,7 +52,9 @@ export class DocumentDetailPage implements OnInit {
this.LoadedDocument.Subject = this.LoadedDocument.Assunto
let thedate = new Date(this.LoadedDocument.DateDispatch);
let thedate = new Date(this.LoadedDocument.DateDispatch || this.LoadedDocument.DocDate);
console.log(res)
this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]);
});
}
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+7 -5
View File
@@ -202,13 +202,14 @@
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('dateOccurrence')?.invalid && validateFrom ">
<!-- (ngModelChange)="onSelectedRecurringChanged($event)" -->
<mat-form-field appearance="none" floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
<mat-select placeholder="Selecione repetição*"
[(ngModel)]="EventRecurrenceType"
(ngModelChange)="onSelectedRecurringChanged($event)">
[(ngModel)]="EventRecurrenceType"
>
<mat-option
*ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
*ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
>
{{recurring.Description}}
</mat-option>
@@ -224,7 +225,8 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div (click)="openLastOccurrence()" class="ion-input-class flex-grow-1">
<!-- (click)="openLastOccurrence()" -->
<div class="ion-input-class flex-grow-1">
<!-- <ion-datetime
placeholder="Última ocorrência"
[(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
src/app/pages/events/events.page.html
+6 -2
View File
@@ -53,8 +53,12 @@
<div class="d-flex content-{{loggeduser.Profile}}-{{event.CalendarName}}">
<div class="schedule-time">
<div class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
<div class="time-end">{{event.EndDate | date: 'HH:mm'}}</div>
<div *ngIf="!event.IsAllDayEvent" class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="!event.IsAllDayEvent" class="time-end">{{event.EndDate | date: 'HH:mm'}}</div>
<div *ngIf="event.IsAllDayEvent" class="time-start"> Todo </div>
<div *ngIf="event.IsAllDayEvent" class="time-end text-center"> o dia </div>
<div></div>
</div>
<div class="schedule-details">
<div class="location">{{event.Location}}</div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -102,7 +102,7 @@
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
<button *ngIf="!p.userRole(['PR'])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
<div class="solid"></div>
</div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+2
View File
@@ -17,6 +17,7 @@ import { Location } from '@angular/common';
import { SearchPage } from 'src/app/pages/search/search.page';
import { SearchDocument } from 'src/app/models/search-document';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { PermissionService } from 'src/app/OtherService/permission.service';
@Component({
selector: 'app-expediente-detail',
@@ -56,6 +57,7 @@ export class ExpedienteDetailPage implements OnInit {
private toastService: ToastService,
private location: Location,
private attachmentsService: AttachmentsService,
public p: PermissionService
) {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
-1
View File
@@ -136,7 +136,6 @@ export class OptsExpedientePage implements OnInit {
async openExpedientActionsModal(taskAction: any, task: any) {
alert('save')
console.log(taskAction, task)
this.close();
src/app/shared/publication/view-publications/view-publications.page.ts
+1 -1
View File
@@ -59,6 +59,7 @@ export class ViewPublicationsPage implements OnInit {
if(typeof(this.folderId) == 'object') {
this.folderId = this.folderId['ProcessId']
}
console.log('change view to ',this.folderId)
setTimeout(()=>{
this.getPublications();
@@ -73,7 +74,6 @@ export class ViewPublicationsPage implements OnInit {
setTimeout(() => {
this.getPublicationDetail();
event.target.complete();
}, 3000);
}
src/app/store/publication-list.service.ts
+4 -4
View File
@@ -9,7 +9,7 @@ import { SHA1 } from 'crypto-js'
export class PublicationListService {
// main data
private _document: Publication[] = []
private _document = {}
// local storage keyName
private keyName: string;
@@ -18,8 +18,8 @@ export class PublicationListService {
this.keyName = (SHA1(this.constructor.name+ 'view-publication-list/local')).toString()
setTimeout(()=>{
let restore = localstoreService.get(this.keyName, [])
this._document = restore.document
let restore = localstoreService.get(this.keyName, {})
this._document = restore.document || {}
}, 10)
}
@@ -28,7 +28,7 @@ export class PublicationListService {
return this._document
}
getDocument(folderId: string) {
getDocument(folderId) {
return this._document[folderId]
}