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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Eudes Inácio
2021-12-07 10:31:13 +01:00
parent 8b90f122d3 b6511f29d2
commit 1b8bec0afb
10 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+14 -7
View File
@@ -514,6 +514,7 @@ export class AgendaPage implements OnInit {
this.CalendarStore.pushEvent(response, 'md');
console.log('CALENDAR STORE', this.CalendarStore.eventSource)
this.listToPresent = this.CalendarStore.eventSource
this.trasnformData(response, 'md');
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
@@ -542,7 +543,9 @@ export class AgendaPage implements OnInit {
this.CalendarStore.removeRange(startTime, endTime, 'pr')
// calendar
this.CalendarStore.pushEvent(response, 'pr');
this.trasnformData(response, 'pr');
this.listToPresent = this.CalendarStore.eventSource
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
@@ -572,7 +575,8 @@ export class AgendaPage implements OnInit {
// startTime = 1, endTime = 31
this.CalendarStore.removeRange(startTime, endTime, 'pr')
this.CalendarStore.pushEvent(response, 'pr');
this.trasnformData(response, 'pr')
this.listToPresent = this.CalendarStore.eventSource
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
@@ -611,7 +615,8 @@ export class AgendaPage implements OnInit {
// loop
this.CalendarStore.pushEvent(eventsList, 'md');
this.trasnformData(response, 'md')
this.listToPresent = this.CalendarStore.eventSource
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
@@ -643,10 +648,12 @@ export class AgendaPage implements OnInit {
let eventsList = response;
// clear the current month only
/* this.CalendarStore.removeRange(startTime, endTime, 'pr')
this.CalendarStore.removeRange(startTime, endTime, 'pr')
this.CalendarStore.pushEvent(eventsList, 'pr');
this.listToPresent = this.CalendarStore.eventSource
this.CalendarStore.pushEvent(eventsList, 'pr'); */
this.trasnformData(response, 'pr')
this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
@@ -692,7 +699,7 @@ export class AgendaPage implements OnInit {
this.CalendarStore.removeRange(startTime, endTime, 'pr')
this.CalendarStore.pushEvent(eventsList, 'pr');
this.trasnformData(eventsList, 'pr')
this.listToPresent = this.CalendarStore.eventSource
this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
src/app/pages/agenda/edit-event/edit-event.page.ts
+11 -10
View File
@@ -41,13 +41,11 @@ export class EditEventPage implements OnInit {
recurringTypes: any;
selectedRecurringType: any;
loadedEventAttachments: Attachment[] = [];
taskParticipants: any = [];
taskParticipantsCc: any = [];
adding: "intervenient" | "CC" = "intervenient";
showAttendees = false;
constructor(
@@ -196,19 +194,22 @@ export class EditEventPage implements OnInit {
this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
if(this.initCalendarName != this.postEvent.CalendarName){
if(this.initCalendarName != this.postEvent.CalendarName) {
let body = {
"EventId": this.postEvent.EventId,
"CalendarDestinationName": this.postEvent.CalendarName,
}
try {
await this.eventsService.changeAgenda(body).toPromise();
} catch (error) {}
finally {
this.goBack();
}
try {
await this.eventsService.changeAgenda(body).toPromise();
} catch (error) {}
finally {
this.goBack();
}
}
}
this.toastService.successMessage();
}, error => {
src/app/pages/agenda/view-event/view-event.page.scss
+1 -1
View File
@@ -198,7 +198,7 @@ ion-menu{
.attach-title-item{
width: 100%;
font-size: 15px;
color:var(--title-text-color);
color: var(--title-text-color);
}
/* SPAN */
.span-left{
src/app/shared/agenda/edit-event/edit-event.page.scss
+1 -1
View File
@@ -117,7 +117,7 @@ ion-content{
.attach-title-item{
width: 100%;
font-size: 15px;
color:#0d89d1;
color: var(--title-text-color);
}
/* SPAN */
.span-left{
src/app/shared/agenda/edit-event/edit-event.page.ts
+1 -1
View File
@@ -14,7 +14,6 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
import { ParticipantsPipe } from 'src/app/pipes/participants.pipe';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-edit-event',
templateUrl: './edit-event.page.html',
@@ -127,6 +126,7 @@ export class EditEventPage implements OnInit {
}
}
this.initCalendarName = this.postEvent.CalendarName;
this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments)
src/app/shared/agenda/view-event/view-event.page.scss
+1 -1
View File
@@ -176,7 +176,7 @@ ion-content{
.attach-title-item{
width: 100%;
font-size: 15px;
color:#0d89d1;
color:var(--title-text-color);
}
/* SPAN */
.span-left{
src/app/shared/popover/despachos-options/despachos-options.page.ts
+4 -4
View File
@@ -216,19 +216,19 @@ export class DespachosOptionsPage implements OnInit {
Attachments: DocumentToSave,
}
if(actionName == 'Executado'){
if(actionName == 'Executado') {
await this.executado(res.data.note, docs);
}
else if(actionName == 'Arquivar'){
await this.arquivar(res.data.note, docs);
}
else if(actionName == 'Gerar Diploma'){
else if(actionName == 'Gerar Diploma') {
await this.generateDiploma(res.data.note, docs);
}
else if(actionName == 'Concluido'){
else if(actionName == 'Concluido') {
//this.concluir(res.data.note, docs);
}
else if(actionName == 'Reexecução'){
else if(actionName == 'Reexecução') {
await this.reexecutar(res.data.note, docs);
}
this.goBack();
src/app/shared/popover/opts-expediente/opts-expediente.page.html
+2 -2
View File
@@ -28,8 +28,8 @@
</div>
<div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
<div class="flex-grow-1">
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >11Efetuar Despacho</button>
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >11Efetuar Despacho</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)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
src/index.html
+1 -1
View File
@@ -11,7 +11,7 @@
<script type="text/javascript" src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script> -->
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.9.359/pdf.min.js" integrity="sha512-U5C477Z8VvmbYAoV4HDq17tf4wG6HXPC6/KM9+0/wEXQQ13gmKY2Zb0Z2vu0VNUWch4GlJ+Tl/dfoLOH4i2msw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<!-- <script src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script>
<!-- <script src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script>
<script src="node_modules/ibm-mfp-web-sdk/ibmmfpfanalytics.js"></script> -->
<!-- <script src="assets/js/index.js"></script> -->
<link rel="manifest" href="assets/manifest.json">
src/theme/variables.scss
+9
View File
@@ -715,6 +715,10 @@ body {
}
}
}
.desk{
color: black !important;
}
}
.gov {
@@ -794,6 +798,10 @@ body {
}
}
}
.desk{
color: black !important;
}
}
// blue
@@ -913,6 +921,7 @@ body {
}
}
}
}
.font-awesome {