mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
change text, fixe create and edit event
This commit is contained in:
@@ -425,7 +425,7 @@ export class EditEventPage implements OnInit {
|
|||||||
this.isEventEdited = true;
|
this.isEventEdited = true;
|
||||||
|
|
||||||
|
|
||||||
/* await this.saveDocument() */
|
await this.saveDocument()
|
||||||
|
|
||||||
this.goBack();
|
this.goBack();
|
||||||
}
|
}
|
||||||
@@ -452,7 +452,7 @@ export class EditEventPage implements OnInit {
|
|||||||
SerialNumber: '',
|
SerialNumber: '',
|
||||||
};
|
};
|
||||||
|
|
||||||
await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise();
|
// await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise();
|
||||||
|
|
||||||
} else if(remove) {
|
} else if(remove) {
|
||||||
await this.attachmentsService.deleteEventAttachmentById(e.Id).toPromise()
|
await this.attachmentsService.deleteEventAttachmentById(e.Id).toPromise()
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<ion-header class="ion-no-border header-2">
|
<ion-header class="ion-no-border header-2">
|
||||||
<app-task-list-header
|
<app-task-list-header
|
||||||
[goBackButton] = true
|
[goBackButton] = true
|
||||||
[headerName] = environment.dispatchPR
|
[headerName] = headerName
|
||||||
[ordinance] = ordinance
|
[ordinance] = ordinance
|
||||||
[loading] = skeletonLoader
|
[loading] = skeletonLoader
|
||||||
(reorderList) = reorderList($event)
|
(reorderList) = reorderList($event)
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
|
|||||||
import { environment } from 'src/environments/environment';
|
import { environment } from 'src/environments/environment';
|
||||||
import { TaskService } from 'src/app/services/task.service'
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
import { RouteService } from 'src/app/services/route.service';
|
import { RouteService } from 'src/app/services/route.service';
|
||||||
|
import { PermissionService } from 'src/app/services/permission.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-despachos-pr',
|
selector: 'app-despachos-pr',
|
||||||
@@ -58,6 +59,7 @@ export class DespachosPrPage implements OnInit {
|
|||||||
list = []
|
list = []
|
||||||
|
|
||||||
ordinance: string = 'old'
|
ordinance: string = 'old'
|
||||||
|
headerName = ''
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private processes: ProcessesService,
|
private processes: ProcessesService,
|
||||||
@@ -69,10 +71,16 @@ export class DespachosPrPage implements OnInit {
|
|||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
public TaskService: TaskService,
|
public TaskService: TaskService,
|
||||||
private RouteService: RouteService,
|
private RouteService: RouteService,
|
||||||
|
public p: PermissionService,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
this.profile = 'mdgpr';
|
this.profile = 'mdgpr';
|
||||||
|
|
||||||
|
if(this.p.userPermission([this.p.permissionList.Gabinete.md_tasks])) {
|
||||||
|
this.headerName = `Despachos ${ environment.despachoLabel }`
|
||||||
|
} else {
|
||||||
|
this.headerName = "Despachos criados por mim"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|||||||
@@ -50,7 +50,8 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="bottom-title d-flex">
|
<div class="bottom-title d-flex">
|
||||||
<h3 class="bottom-text">Diplomas por Assinar PR</h3>
|
<h3 class="bottom-text" *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Diplomas por Assinar PR</h3>
|
||||||
|
<h3 class="bottom-text" *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas para Assinar PR</h3>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
.bottom-text{
|
.bottom-text{
|
||||||
font-size: rem(15) !important;
|
font-size: rem(15) !important;
|
||||||
font-family: Roboto !important;
|
font-family: Roboto !important;
|
||||||
color: #0d89d1 !important;
|
color: black !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.item-list-small{
|
.item-list-small{
|
||||||
@@ -240,3 +240,4 @@ ion-item{
|
|||||||
float: right;
|
float: right;
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { ThemeService } from 'src/app/services/theme.service'
|
|||||||
import { DeplomasStore } from 'src/app/store/deplomas.service';
|
import { DeplomasStore } from 'src/app/store/deplomas.service';
|
||||||
import { TaskService } from 'src/app/services/task.service'
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
import { RouteService } from 'src/app/services/route.service';
|
import { RouteService } from 'src/app/services/route.service';
|
||||||
|
import { PermissionService } from 'src/app/services/permission.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-diplomas-assinar',
|
selector: 'app-diplomas-assinar',
|
||||||
@@ -37,7 +38,8 @@ export class DiplomasAssinarPage implements OnInit {
|
|||||||
private router: Router,
|
private router: Router,
|
||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
public TaskService: TaskService,
|
public TaskService: TaskService,
|
||||||
private RouteService: RouteService,) {
|
private RouteService: RouteService,
|
||||||
|
public p: PermissionService,) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|||||||
@@ -397,7 +397,7 @@ export class EditEventPage implements OnInit {
|
|||||||
this.clearPostEvent.emit();
|
this.clearPostEvent.emit();
|
||||||
this.deleteTemporaryData();
|
this.deleteTemporaryData();
|
||||||
|
|
||||||
/* await this.saveDocument() */
|
await this.saveDocument()
|
||||||
|
|
||||||
this.close();
|
this.close();
|
||||||
}
|
}
|
||||||
@@ -425,7 +425,7 @@ export class EditEventPage implements OnInit {
|
|||||||
SerialNumber: '',
|
SerialNumber: '',
|
||||||
};
|
};
|
||||||
|
|
||||||
await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise();
|
// await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise();
|
||||||
|
|
||||||
} else if(remove) {
|
} else if(remove) {
|
||||||
await this.attachmentsService.deleteEventAttachmentById(e.Id).toPromise()
|
await this.attachmentsService.deleteEventAttachmentById(e.Id).toPromise()
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<app-task-list-header
|
<app-task-list-header
|
||||||
class="width-100 height-100"
|
class="width-100 height-100"
|
||||||
[goBackButton] = false
|
[goBackButton] = false
|
||||||
[headerName] = environment.dispatchPR
|
[headerName] = headerName
|
||||||
[ordinance] = ordinance
|
[ordinance] = ordinance
|
||||||
[loading] = skeletonLoader
|
[loading] = skeletonLoader
|
||||||
[loaderTop] = true
|
[loaderTop] = true
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { SessionStore } from 'src/app/store/session.service';
|
|||||||
import { environment } from 'src/environments/environment';
|
import { environment } from 'src/environments/environment';
|
||||||
import { TaskService } from 'src/app/services/task.service'
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
import { ThemeService } from 'src/app/services/theme.service'
|
import { ThemeService } from 'src/app/services/theme.service'
|
||||||
|
import { PermissionService } from 'src/app/services/permission.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-despachos-pr',
|
selector: 'app-despachos-pr',
|
||||||
@@ -34,14 +34,23 @@ export class DespachosPrPage implements OnInit {
|
|||||||
delete(): void;
|
delete(): void;
|
||||||
}
|
}
|
||||||
routerSubscription;
|
routerSubscription;
|
||||||
|
headerName = ''
|
||||||
|
|
||||||
constructor (
|
constructor (
|
||||||
private router: Router,
|
private router: Router,
|
||||||
public TaskService: TaskService,
|
public TaskService: TaskService,
|
||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
|
public p: PermissionService,
|
||||||
|
|
||||||
) {
|
) {
|
||||||
this.loggeduser = SessionStore.user;
|
this.loggeduser = SessionStore.user;
|
||||||
|
|
||||||
|
|
||||||
|
if(this.p.userPermission([this.p.permissionList.Gabinete.md_tasks])) {
|
||||||
|
this.headerName = `Despachos ${ environment.despachoLabel }`
|
||||||
|
} else {
|
||||||
|
this.headerName = "Despachos criados por mim"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<ion-header class="ion-no-border">
|
<ion-header class="ion-no-border">
|
||||||
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
|
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
|
||||||
<div class="title">
|
<div class="title">
|
||||||
<div class="thetitle"><ion-label >Diplomas para assinar</ion-label></div>
|
<div class="thetitle"><ion-label *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" >Diplomas por Assinar PR</ion-label></div>
|
||||||
|
<div class="thetitle"><ion-label *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" >Diplomas para assinar PR</ion-label></div>
|
||||||
<div class="theicon d-flex align-center">
|
<div class="theicon d-flex align-center">
|
||||||
<!-- <div>
|
<!-- <div>
|
||||||
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
|
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { NavigationStart, Router } from '@angular/router';
|
import { NavigationStart, Router } from '@angular/router';
|
||||||
import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
|
|
||||||
import { ProcessesService } from 'src/app/services/processes.service';
|
|
||||||
import { DeplomasStore } from 'src/app/store/deplomas.service';
|
import { DeplomasStore } from 'src/app/store/deplomas.service';
|
||||||
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
|
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
|
||||||
import { SortService } from 'src/app/services/functions/sort.service';
|
|
||||||
import { ThemeService } from 'src/app/services/theme.service'
|
import { ThemeService } from 'src/app/services/theme.service'
|
||||||
import { TaskService } from 'src/app/services/task.service'
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
import { PermissionService } from 'src/app/services/permission.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-diplomas-assinar',
|
selector: 'app-diplomas-assinar',
|
||||||
@@ -36,7 +34,8 @@ export class DiplomasAssinarPage implements OnInit {
|
|||||||
constructor(
|
constructor(
|
||||||
private router: Router,
|
private router: Router,
|
||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
public TaskService: TaskService
|
public TaskService: TaskService,
|
||||||
|
public p: PermissionService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|||||||
Reference in New Issue
Block a user