mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
add attachments
This commit is contained in:
Peter Maquiran
@@ -35,12 +35,13 @@
|
||||
<ion-label>
|
||||
<p class="d-flex ion-justify-content-between">
|
||||
<span class="attach-title-item">{{document.Assunto}}</span>
|
||||
<span class="app-name">{{document.appName}}</span>
|
||||
<span class="app-name" *ngIf="!document.appName">{{ TaskService.attachmentAppName(document)}}</span>
|
||||
<span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
|
||||
<span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
|
||||
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||
</span>
|
||||
</p>
|
||||
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
<p><span class="span-left">{{(document.EntidadeOrganicaNome || document.Sender)}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
|
||||
@@ -3,7 +3,7 @@ import { AnimationController, ModalController, NavParams } from '@ionic/angular'
|
||||
import { SearchList } from 'src/app/models/search-document';
|
||||
import { SearchPage } from 'src/app/pages/search/search.page';
|
||||
import { ThemeService } from 'src/app/services/theme.service'
|
||||
|
||||
import { TaskService } from 'src/app/services/task.service'
|
||||
@Component({
|
||||
selector: 'app-add-note',
|
||||
templateUrl: './add-note.page.html',
|
||||
@@ -20,7 +20,8 @@ export class AddNotePage implements OnInit {
|
||||
private modalController: ModalController,
|
||||
private animationController: AnimationController,
|
||||
private navParams: NavParams,
|
||||
public ThemeService: ThemeService
|
||||
public ThemeService: ThemeService,
|
||||
public TaskService: TaskService
|
||||
) {
|
||||
this.note = '';
|
||||
this.hideThisFeature = this.navParams.get('showAttachmentBtn');
|
||||
|
||||
@@ -146,6 +146,7 @@
|
||||
<ion-label>
|
||||
<p class="d-flex ion-justify-content-between">
|
||||
<span class="attach-title-item">{{document.Assunto}}</span>
|
||||
<span class="app-name" *ngIf="!document.appName">{{ TaskService.attachmentAppName(document)}}</span>
|
||||
<span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
|
||||
<span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
|
||||
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||
|
||||
@@ -22,7 +22,7 @@ import { fullTask } from 'src/app/models/dailyworktask.model';
|
||||
import { ThemeService } from 'src/app/services/theme.service'
|
||||
import { SessionStore } from 'src/app/store/session.service';
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
|
||||
import { TaskService } from 'src/app/services/task.service'
|
||||
|
||||
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||
parse: {
|
||||
@@ -99,7 +99,8 @@ export class CreateProcessPage implements OnInit {
|
||||
private despachoService: DespachoService,
|
||||
private pedidoService: PedidoService,
|
||||
public ThemeService: ThemeService,
|
||||
private httpsErrorHanlde: HttpErrorHandle
|
||||
private httpsErrorHanlde: HttpErrorHandle,
|
||||
public TaskService: TaskService
|
||||
) {
|
||||
this.loggeduser = SessionStore.user;
|
||||
this.task = this.navParams.get('task');
|
||||
@@ -354,7 +355,9 @@ export class CreateProcessPage implements OnInit {
|
||||
|
||||
try {
|
||||
if (this.task.activityInstanceName == 'Tarefa de Despacho' || this.task.activityInstanceName == 'Reexecutar Despacho') {
|
||||
// create parecer
|
||||
await this.despachoService.createParecer(this.postData).toPromise();
|
||||
// task complete
|
||||
await this.despachoService.solicitarParecer({ note: this.postData.DispatchFolder.Message, serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName }).toPromise();
|
||||
} else {
|
||||
|
||||
|
||||
@@ -40,12 +40,13 @@
|
||||
<ion-label>
|
||||
<p class="d-flex ion-justify-content-between">
|
||||
<span class="attach-title-item">{{document.Assunto}}</span>
|
||||
<span class="app-name">{{document.appName}}</span>
|
||||
<span class="app-name" *ngIf="!document.appName">{{ TaskService.attachmentAppName(document)}}</span>
|
||||
<span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
|
||||
<span class="close-button text-black" (click)="removeAttachment(i)" >
|
||||
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||
</span>
|
||||
</p>
|
||||
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
<p><span class="span-left">{{(document.EntidadeOrganicaNome || document.Sender)}}</span><span class="span-right"> {{(document.Data || document.DocDate) | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
|
||||
@@ -6,6 +6,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
|
||||
import { ToastService } from 'src/app/services/toast.service';
|
||||
import { ThemeService } from 'src/app/services/theme.service';
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
import { TaskService } from 'src/app/services/task.service'
|
||||
|
||||
@Component({
|
||||
selector: 'app-dar-parecer',
|
||||
@@ -25,7 +26,8 @@ export class DarParecerPage implements OnInit {
|
||||
private animationController: AnimationController,
|
||||
private toastService: ToastService,
|
||||
public ThemeService: ThemeService,
|
||||
private httpErroHanlde: HttpErrorHandle
|
||||
private httpErroHanlde: HttpErrorHandle,
|
||||
public TaskService: TaskService
|
||||
) {
|
||||
this.serialNumber = this.navParams.get('serialNumber');
|
||||
this.instanceId = this.navParams.get('ProcessInstanceID');
|
||||
|
||||
@@ -62,12 +62,13 @@
|
||||
<ion-label>
|
||||
<p class="d-flex ion-justify-content-between">
|
||||
<span class="attach-title-item">{{document.Assunto}}</span>
|
||||
<span class="app-name">{{document.appName}}</span>
|
||||
<span class="app-name" *ngIf="!document.appName">{{ TaskService.attachmentAppName(document)}}</span>
|
||||
<span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
|
||||
<span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
|
||||
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||
</span>
|
||||
</p>
|
||||
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
<p><span class="span-left">{{(document.EntidadeOrganicaNome || document.Sender)}}</span><span class="span-right"> {{(document.Data || document.DocDate) | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
|
||||
@@ -11,7 +11,7 @@ import { SearchList } from 'src/app/models/search-document';
|
||||
import { SearchPage } from 'src/app/pages/search/search.page';
|
||||
import { ThemeService } from 'src/app/services/theme.service'
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
|
||||
import { TaskService } from 'src/app/services/task.service'
|
||||
|
||||
@Component({
|
||||
selector: 'app-delegar',
|
||||
@@ -47,7 +47,8 @@ export class DelegarPage implements OnInit {
|
||||
public alertController: AlertController,
|
||||
private toastService: ToastService,
|
||||
public ThemeService: ThemeService,
|
||||
private httpErrorHandle: HttpErrorHandle
|
||||
private httpErrorHandle: HttpErrorHandle,
|
||||
public TaskService: TaskService
|
||||
) {
|
||||
this.task = this.navParams.get('task');
|
||||
this.postData = new Event();
|
||||
|
||||
@@ -192,7 +192,6 @@ export class DocumentDetailPage implements OnInit {
|
||||
componentProps: {
|
||||
taskAction: taskAction,
|
||||
task: this.DocumentTask,
|
||||
seachDocuments: this.LoadedDocument,
|
||||
aplicationId: this.LoadedDocument.ApplicationId || this.LoadedDocument.ApplicationID
|
||||
},
|
||||
cssClass: classs,
|
||||
|
||||
@@ -317,12 +317,13 @@
|
||||
<ion-label>
|
||||
<p class="d-flex ion-justify-content-between">
|
||||
<span class="attach-title-item">{{document.Assunto}}</span>
|
||||
<span class="app-name" *ngIf="!document.appName">{{ TaskService.attachmentAppName(document)}}</span>
|
||||
<span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
|
||||
<span class="close-button text-black" (click)="removeAttachment(i)" >
|
||||
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||
</span>
|
||||
</p>
|
||||
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{(document.Data ||document.DocDate) | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
<p><span class="span-left">{{(document.EntidadeOrganicaNome || document.Sender)}}</span><span class="span-right"> {{(document.Data ||document.DocDate) | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
|
||||
@@ -21,6 +21,7 @@ import { ThemeService } from 'src/app/services/theme.service';
|
||||
import { SessionStore } from 'src/app/store/session.service';
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
import { environment } from 'src/environments/environment';
|
||||
import { TaskService } from 'src/app/services/task.service'
|
||||
|
||||
|
||||
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||
@@ -109,7 +110,8 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
||||
private eventService: EventService,
|
||||
public ThemeService: ThemeService,
|
||||
public _eventService: EventsService,
|
||||
private httpErroHandle: HttpErrorHandle
|
||||
private httpErroHandle: HttpErrorHandle,
|
||||
public TaskService: TaskService
|
||||
) {
|
||||
this.loggeduser = SessionStore.user;
|
||||
this.document = this.navParams.get('document')
|
||||
|
||||
@@ -33,7 +33,6 @@ export class ViewDocumentPage implements OnInit {
|
||||
private alertController: AlertController,
|
||||
) {
|
||||
this.file = this.navParams.get('file');
|
||||
console.log(this.file )
|
||||
this.applicationId = this.navParams.get('applicationId');
|
||||
this.docId = this.navParams.get('docId');
|
||||
this.Document = this.navParams.get('Document')
|
||||
@@ -45,6 +44,14 @@ export class ViewDocumentPage implements OnInit {
|
||||
this.file.title = 'Sem Título'
|
||||
}
|
||||
|
||||
console.log({
|
||||
file: this.file,
|
||||
applicationId: this.applicationId,
|
||||
docId: this.docId,
|
||||
Document: this.Document,
|
||||
task: this.task,
|
||||
attachment: this.attachment
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
@@ -94,10 +101,8 @@ export class ViewDocumentPage implements OnInit {
|
||||
component: EventDetailsDocumentsOptionsPage,
|
||||
cssClass: 'model aside-modal search-submodal',
|
||||
componentProps: {
|
||||
fulltask: this.task,
|
||||
task: this.task,
|
||||
content: "",
|
||||
Document:this.Document
|
||||
content: "", // check
|
||||
Document:this.Document // check
|
||||
}
|
||||
});
|
||||
await modal.present();
|
||||
@@ -127,11 +132,13 @@ export class ViewDocumentPage implements OnInit {
|
||||
} else {
|
||||
classs = 'modal modal-desktop showAsideOptions'
|
||||
}
|
||||
|
||||
// check passing
|
||||
const modal = await this.modalController.create({
|
||||
component: DocumentSetUpMeetingPage,
|
||||
componentProps: {
|
||||
subject: this.task.workflowInstanceDataFields.Subject,
|
||||
document: this.Document,
|
||||
subject: this.task.workflowInstanceDataFields.Subject, // check
|
||||
document: this.Document, // document
|
||||
},
|
||||
cssClass: classs,
|
||||
backdropDismiss: false
|
||||
@@ -156,13 +163,14 @@ export class ViewDocumentPage implements OnInit {
|
||||
} else {
|
||||
classs = 'modal modal-desktop showAsideOptions'
|
||||
}
|
||||
// check passing
|
||||
const modal = await this.modalController.create({
|
||||
component: ExpedientTaskModalPage,
|
||||
componentProps: {
|
||||
taskAction: taskAction,
|
||||
task: this.task,
|
||||
seachDocuments: this.Document,
|
||||
aplicationId: this.Document.ApplicationId || this.Document.ApplicationID
|
||||
taskAction: taskAction, // check
|
||||
task: this.task, // check
|
||||
document: this.Document, // nope
|
||||
aplicationId: this.Document.ApplicationId || this.Document.ApplicationID // check
|
||||
},
|
||||
cssClass: classs,
|
||||
});
|
||||
|
||||
@@ -2,10 +2,10 @@ export class Folder{
|
||||
Nad:number;
|
||||
Subject: string;
|
||||
Message:string;
|
||||
SourceSecFsId?:string;
|
||||
SourceSecFsId:string;
|
||||
SourceType:string;
|
||||
SourceId:string;
|
||||
DeadlineType: string;
|
||||
SubjectTypes: string[];
|
||||
NumberPDPP?:string;
|
||||
NumberPDPP:string;
|
||||
}
|
||||
@@ -288,7 +288,7 @@
|
||||
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||
</span>
|
||||
</p>
|
||||
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
<p><span class="span-left">{{(document.EntidadeOrganicaNome || document.Sender)}}</span><span class="span-right"> {{(document.Data || document.DocDate) | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
|
||||
@@ -20,6 +20,7 @@ import { SessionStore } from 'src/app/store/session.service';
|
||||
import { ChatMethodsService } from 'src/app/services/chat/chat-methods.service';
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
import { environment } from 'src/environments/environment';
|
||||
import { TaskService } from 'src/app/services/task.service'
|
||||
|
||||
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||
parse: {
|
||||
@@ -101,7 +102,8 @@ export class NewEventPage implements OnInit {
|
||||
public ThemeService: ThemeService,
|
||||
private platform: Platform,
|
||||
private chatMethodService: ChatMethodsService,
|
||||
private hhtpErrorHandle: HttpErrorHandle
|
||||
private hhtpErrorHandle: HttpErrorHandle,
|
||||
public TaskService: TaskService
|
||||
) {
|
||||
this.loggeduser = SessionStore.user;
|
||||
this.postEvent = new Event();
|
||||
|
||||
+1
@@ -280,6 +280,7 @@
|
||||
<ion-label>
|
||||
<p class="d-flex ion-justify-content-between">
|
||||
<span class="attach-title-item">{{document.Assunto}}</span>
|
||||
<span class="app-name" *ngIf="!document.appName">{{ TaskService.attachmentAppName(document)}}</span>
|
||||
<span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
|
||||
<span class="close-button text-black" (click)="removeAttachment(i)" >
|
||||
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||
|
||||
+3
-2
@@ -22,7 +22,7 @@ import { SessionStore } from 'src/app/store/session.service';
|
||||
import { RoleIdService } from 'src/app/services/role-id.service';
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
import { environment } from 'src/environments/environment';
|
||||
|
||||
import { TaskService } from 'src/app/services/task.service'
|
||||
|
||||
const moment = _rollupMoment || _moment;
|
||||
|
||||
@@ -124,7 +124,8 @@ export class BookMeetingModalPage implements OnInit {
|
||||
public ThemeService: ThemeService,
|
||||
public eventService: EventsService,
|
||||
public RoleIdService: RoleIdService,
|
||||
private httpErroHandle: HttpErrorHandle
|
||||
private httpErroHandle: HttpErrorHandle,
|
||||
public TaskService: TaskService
|
||||
|
||||
|
||||
) {
|
||||
|
||||
+3
-2
@@ -196,12 +196,13 @@
|
||||
<ion-label>
|
||||
<p class="d-flex ion-justify-content-between">
|
||||
<span class="attach-title-item">{{document.Assunto}}</span>
|
||||
<span class="app-name">{{document.appName}}</span>
|
||||
<span class="app-name" *ngIf="!document.appName">{{ TaskService.attachmentAppName(document)}}</span>
|
||||
<span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
|
||||
<span class="close-button text-black" (click)="removeAttachment(i)" >
|
||||
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||
</span>
|
||||
</p>
|
||||
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
<p><span class="span-left">{{(document.EntidadeOrganicaNome || document.Sender)}}</span><span class="span-right"> {{(document.Data || document.DocDate) | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
|
||||
+33
-1
@@ -26,7 +26,7 @@ import { SessionStore } from 'src/app/store/session.service';
|
||||
import { PermissionService } from 'src/app/services/permission.service';
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
import { RouteService } from 'src/app/services/route.service';
|
||||
|
||||
import { TaskService } from 'src/app/services/task.service'
|
||||
|
||||
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||
parse: {
|
||||
@@ -95,6 +95,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
Form: FormGroup;
|
||||
validateFrom = false;
|
||||
validateField = false;
|
||||
document: any
|
||||
|
||||
get toppingsValues() {
|
||||
return this.toppings.value;
|
||||
@@ -113,6 +114,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
public p: PermissionService,
|
||||
private httpErroHandle: HttpErrorHandle,
|
||||
private RouteService: RouteService,
|
||||
public TaskService: TaskService
|
||||
) {
|
||||
|
||||
this.loggeduser = SessionStore.user;
|
||||
@@ -122,9 +124,39 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
|
||||
this.SearchFolder = this.navParams.get('SearchFolder');
|
||||
this.aplicationId = this.navParams.get('aplicationId')
|
||||
this.document = this.navParams.get('document')
|
||||
|
||||
this.taskType = this.navParams.get('taskAction');
|
||||
|
||||
|
||||
if(this.document) {
|
||||
const doc: any = this.document
|
||||
|
||||
this.documents.push({
|
||||
ApplicationId: (doc.ApplicationType || doc.ApplicationId),
|
||||
ApplicationType: (doc.ApplicationType || doc.ApplicationId),
|
||||
SourceId: (doc.Id || doc.DocId || doc.SourceId),
|
||||
Id: (doc.Id || doc.DocId || doc.SourceId),
|
||||
EntidadeOrganicaNome: (doc.sender || doc.SourceName || doc. EntidadeOrganicaNome),
|
||||
Sender: (doc.sender || doc.SourceName || doc. EntidadeOrganicaNome),
|
||||
Data: (doc.DocDate || doc.Data),
|
||||
DocDate: (doc.DocDate || doc.Data),
|
||||
Assunto: doc.Assunto,
|
||||
} as any)
|
||||
}
|
||||
|
||||
|
||||
const DocumentToSave = this.documents.map((e) => {
|
||||
return {
|
||||
ApplicationId: e.ApplicationType,
|
||||
SourceId: e.Id
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
console.log('this.document', this.document)
|
||||
|
||||
|
||||
this.selectedTypes = ['99999850'];
|
||||
|
||||
this.postData = new Despacho();
|
||||
|
||||
@@ -14,7 +14,6 @@ import { DespachoService } from 'src/app/Rules/despacho.service';
|
||||
import { CustomTaskPipe } from '../pipes/custom-task.pipe';
|
||||
import { SessionStore } from 'src/app/store/session.service';
|
||||
import { EventsService } from './events.service';
|
||||
import { SortService } from './functions/sort.service';
|
||||
import { customTask } from '../models/dailyworktask.model';
|
||||
import { Router } from '@angular/router';
|
||||
import { v4 as uuidv4 } from 'uuid'
|
||||
@@ -486,4 +485,14 @@ export class TaskService {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
attachmentAppName(e) {
|
||||
const ApplicationId = e.ApplicationId || e.ApplicationType
|
||||
if( ApplicationId =='8' || ApplicationId ==8) {
|
||||
return 'Correspondencia'
|
||||
} else if (ApplicationId =='361' || ApplicationId ==361) {
|
||||
return 'ArquivoDespachoElect'
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -318,12 +318,13 @@
|
||||
<ion-label>
|
||||
<p class="d-flex ion-justify-content-between">
|
||||
<span class="attach-title-item">{{document.Assunto}}</span>
|
||||
<span class="app-name">{{document.appName}}</span>
|
||||
<span class="app-name" *ngIf="!document.appName">{{ TaskService.attachmentAppName(document)}}</span>
|
||||
<span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
|
||||
<span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
|
||||
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||
</span>
|
||||
</p>
|
||||
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
<p><span class="span-left">{{(document.EntidadeOrganicaNome || document.Sender)}}</span><span class="span-right"> {{(document.Data || document.DocDate) | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
|
||||
@@ -29,7 +29,7 @@ import { ServerConnectionService } from 'src/app/services/server-connection.serv
|
||||
import { SessionStore } from 'src/app/store/session.service';
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
import { environment } from 'src/environments/environment';
|
||||
|
||||
import { TaskService } from 'src/app/services/task.service'
|
||||
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||
parse: {
|
||||
dateInput: "YYYY-MMMM-DD HH:mm"
|
||||
@@ -135,7 +135,8 @@ export class NewEventPage implements OnInit {
|
||||
private dateAdapter: DateAdapter<any>,
|
||||
public ThemeService: ThemeService,
|
||||
private chatMethodService: ChatMethodsService,
|
||||
private hhtpErrorHandle: HttpErrorHandle
|
||||
private hhtpErrorHandle: HttpErrorHandle,
|
||||
public TaskService: TaskService
|
||||
) {
|
||||
this.dateAdapter.setLocale('pt');
|
||||
this.loggeduser = SessionStore.user;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
export let versionData = {
|
||||
"shortSHA": "4eff2575b",
|
||||
"SHA": "4eff2575b69312a72f16c8e30e03bd6a797bb762",
|
||||
"shortSHA": "081fe8692",
|
||||
"SHA": "081fe8692c8575cc102a91c6357d193d52cb9c0f",
|
||||
"branch": "developer-prod",
|
||||
"lastCommitAuthor": "'Eudes Inácio'",
|
||||
"lastCommitTime": "'Wed Aug 30 20:54:47 2023 +0100'",
|
||||
"lastCommitMessage": "add file on chat its hide",
|
||||
"lastCommitNumber": "5250",
|
||||
"lastCommitTime": "'Wed Aug 30 20:56:46 2023 +0100'",
|
||||
"lastCommitMessage": "pull made",
|
||||
"lastCommitNumber": "5252",
|
||||
"change": "",
|
||||
"changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 3 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/models/folder.model.ts\n\tmodified: src/assets/images/theme/gov/icons-delete.svg",
|
||||
"changeAuthor": "eudes.inacio"
|
||||
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/add-note/add-note.page.html\n\tmodified: src/app/modals/add-note/add-note.page.ts\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.ts\n\tmodified: src/app/modals/delegar/delegar.page.html\n\tmodified: src/app/modals/delegar/delegar.page.ts\n\tmodified: src/app/modals/document-detail/document-detail.page.ts\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\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/models/folder.model.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts",
|
||||
"changeAuthor": "peter.maquiran"
|
||||
}
|
||||
Reference in New Issue
Block a user