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

add attachments

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-31 12:00:52 +01:00
parent 081fe8692c
commit 680f57313f
23 changed files with 117 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/add-note/add-note.page.html
+3 -2
View File
@@ -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>
src/app/modals/add-note/add-note.page.ts
+3 -2
View File
@@ -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');
src/app/modals/create-process/create-process.page.html
+1
View File
@@ -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>
src/app/modals/create-process/create-process.page.ts
+5 -2
View File
@@ -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 {
src/app/modals/dar-parecer/dar-parecer.page.html
+3 -2
View File
@@ -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>
src/app/modals/dar-parecer/dar-parecer.page.ts
+3 -1
View File
@@ -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');
src/app/modals/delegar/delegar.page.html
+3 -2
View File
@@ -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>
src/app/modals/delegar/delegar.page.ts
+3 -2
View File
@@ -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();
src/app/modals/document-detail/document-detail.page.ts
-1
View File
@@ -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,
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+2 -1
View File
@@ -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>
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+3 -1
View File
@@ -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')
src/app/modals/view-document/view-document.page.ts
+19 -11
View File
@@ -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,
});