mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 13:02:56 +00:00
fix
This commit is contained in:
@@ -20,9 +20,8 @@ export class ClearStoreService {
|
||||
|
||||
clear() {
|
||||
|
||||
EventoAprovacaoStore.clear();
|
||||
DespachoStore.reset([])
|
||||
EventoAprovacaoStore.resetmd([])
|
||||
EventoAprovacaoStore.resetpr([])
|
||||
ExpedienteGdStore.reset([])
|
||||
PendentesStore.reset([])
|
||||
PedidosStore.resetdeferimento([])
|
||||
|
||||
@@ -258,12 +258,16 @@ export class EventsService {
|
||||
this.myCalendarNames[sharedCalendar.CalendarId] = e.FullName
|
||||
|
||||
if(!this.calendarNamesAry.find(x => x.Role == e.Role)) {
|
||||
|
||||
|
||||
|
||||
let objectShared = {
|
||||
"Fullname": e.FullName,
|
||||
"Role": e.Role,
|
||||
"OwnerUserId": sharedCalendar.OwnerUserId,
|
||||
"RoleId": sharedCalendar.CalendarRoleId
|
||||
}
|
||||
|
||||
console.log('objectShared', objectShared)
|
||||
|
||||
this.calendarNamesAry.push(objectShared)
|
||||
|
||||
|
||||
@@ -9,6 +9,10 @@ export class SortService {
|
||||
constructor(private ObjectService: ObjectService) { }
|
||||
|
||||
sortArrayISODate(myArray: any) {
|
||||
|
||||
if(!Array.isArray(myArray)) {
|
||||
myArray = []
|
||||
}
|
||||
if(myArray.length > 0){
|
||||
return myArray.sort(function (a, b) {
|
||||
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
|
||||
@@ -17,7 +21,9 @@ export class SortService {
|
||||
}
|
||||
|
||||
sortArrayByDate(myArray: any) {
|
||||
|
||||
if(!Array.isArray(myArray)) {
|
||||
myArray = []
|
||||
}
|
||||
if(myArray.length > 0){
|
||||
return myArray.sort(function (a, b) {
|
||||
return (new Date(a.workflowInstanceDataFields.StartDate) < new Date(b.workflowInstanceDataFields.StartDate)) ? -1 : ((new Date(a.workflowInstanceDataFields.StartDate) > new Date(b.workflowInstanceDataFields.StartDate)) ? 1 : 0);
|
||||
@@ -26,7 +32,10 @@ export class SortService {
|
||||
}
|
||||
|
||||
sortDate(array = [], path: string) {
|
||||
|
||||
if(!Array.isArray(array)) {
|
||||
array = []
|
||||
}
|
||||
|
||||
return array.sort( (a,b)=> {
|
||||
|
||||
return (new Date(this.ObjectService.deepFind(a, path)) < new Date(this.ObjectService.deepFind(b, path))) ? -1 : ((new Date(this.ObjectService.deepFind(a, path)) > new Date(this.ObjectService.deepFind(b, path))) ? 1 : 0);
|
||||
|
||||
@@ -69,6 +69,22 @@ export class ProcessesService {
|
||||
return this.http.get<fullTaskList[]>(`${geturl}`, options);
|
||||
}
|
||||
|
||||
eventsToApprove(userid) {
|
||||
const geturl = environment.apiURL + 'tasks/events-to-approve';
|
||||
let params = new HttpParams();
|
||||
|
||||
params = params.set("pageNum", 1);
|
||||
params = params.set("pageSize", 500);
|
||||
params = params.set("userid", userid);
|
||||
|
||||
let options = {
|
||||
headers: this.headers,
|
||||
params: params
|
||||
};
|
||||
|
||||
return this.http.get<fullTaskList[]>(`${geturl}`, options);
|
||||
}
|
||||
|
||||
GetTaskListExpediente(onlycount1): Observable<ExpedienteFullTask[]> {
|
||||
const processname = "Expediente"
|
||||
const onlycount = false
|
||||
|
||||
Reference in New Issue
Block a user