diff --git a/frontend/src/resources/template/app/component/admin_menu.html b/frontend/src/resources/template/app/component/admin_menu.html index f187ba8..21be41a 100644 --- a/frontend/src/resources/template/app/component/admin_menu.html +++ b/frontend/src/resources/template/app/component/admin_menu.html @@ -1,15 +1,10 @@ -
-
-
\ No newline at end of file + diff --git a/frontend/src/resources/template/app/component/app_header.html b/frontend/src/resources/template/app/component/app_header.html index 2b65eab..62feaf5 100644 --- a/frontend/src/resources/template/app/component/app_header.html +++ b/frontend/src/resources/template/app/component/app_header.html @@ -3,11 +3,7 @@
- -
- -
- +
-
+ diff --git a/frontend/src/resources/template/app/component/process_list.html b/frontend/src/resources/template/app/component/process_list.html deleted file mode 100644 index a24adc3..0000000 --- a/frontend/src/resources/template/app/component/process_list.html +++ /dev/null @@ -1,12 +0,0 @@ -
- -
-
-
- -
-
-
-
\ No newline at end of file diff --git a/frontend/src/resources/template/app/component/task.html b/frontend/src/resources/template/app/component/task.html deleted file mode 100644 index dd079b2..0000000 --- a/frontend/src/resources/template/app/component/task.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
\ No newline at end of file diff --git a/frontend/src/resources/template/app/component/task_list.html b/frontend/src/resources/template/app/component/task_list.html deleted file mode 100644 index 7d245ba..0000000 --- a/frontend/src/resources/template/app/component/task_list.html +++ /dev/null @@ -1,49 +0,0 @@ -
-
-
-
-
    -
  • Фильтры
    • -
  • -
    • -
  • -
    • -
  • -
    • -
-
-
-
-
{{errorMessage}}
-
-
-
-
Процесс
-
Версия
-
Задача
-
Дата создания
-
Срок
-
-
-
-
{{ task.processName }}
-
{{ task.processVersion }}
-
{{ task.name }}
-
{{ task.createdOn | date:'dd.MM.yyyy HH:mm:ss' }}
-
{{ task.expirationTime | date:'dd.MM.yyyy HH:mm:ss' }}
-
-
-
-
-
\ No newline at end of file diff --git a/frontend/src/resources/template/app/component/task_not_found.html b/frontend/src/resources/template/app/component/task_not_found.html deleted file mode 100644 index 2379674..0000000 --- a/frontend/src/resources/template/app/component/task_not_found.html +++ /dev/null @@ -1,8 +0,0 @@ -
-
-
:(
-

Ошибка

- Данная задача не существует.
- Перейти к списку задач
-
-
\ No newline at end of file diff --git a/frontend/src/ts/modules/app/app-routing.module.ts b/frontend/src/ts/modules/app/app-routing.module.ts index 9234308..ec9eda8 100644 --- a/frontend/src/ts/modules/app/app-routing.module.ts +++ b/frontend/src/ts/modules/app/app-routing.module.ts @@ -2,12 +2,11 @@ import {NgModule} from "@angular/core"; import {RouterModule, Routes} from "@angular/router"; import {AccessDeniedComponent} from "./component/access-denied.component"; import {LoginComponent} from "./component/login.component"; -import {AuthenticationGuard, ConfirmExitGuard, SignedInGuard, ProcessInstanceRouteResolver} from "@webbpm/base-package"; +import {AuthenticationGuard, ConfirmExitGuard, SignedInGuard} from "@webbpm/base-package"; import {RegisterComponent} from "./component/register.component"; import {ConfirmUserEmailComponent} from "./component/confirm-user-email.component"; import {ResetPasswordComponent} from "./component/reset-password.component"; import {NewPasswordComponent} from "./component/new-password.component"; -import {TaskListComponent} from "./component/task-list.component"; const appRoutes: Routes = [ { @@ -37,30 +36,6 @@ const appRoutes: Routes = [ path: 'new-password', component: NewPasswordComponent }, - { - path: 'process', - canActivate: [AuthenticationGuard, ConfirmExitGuard], - children: [ - { - path: 'instance', - loadChildren: 'generated-sources/page-process-instance-list.module#PageprocessinstancelistModule', - resolve: { - processInstanceId: ProcessInstanceRouteResolver - } - }, - { - path: 'instance/:processInstanceId', - loadChildren: 'generated-sources/page-process-instance.module#PageprocessinstanceModule', - resolve: { - processInstanceId: ProcessInstanceRouteResolver - } - }, - { - path: 'tasks', - component: TaskListComponent, - } - ] - } ]; @NgModule({ diff --git a/frontend/src/ts/modules/app/app.module.ts b/frontend/src/ts/modules/app/app.module.ts index 4305278..958efb7 100644 --- a/frontend/src/ts/modules/app/app.module.ts +++ b/frontend/src/ts/modules/app/app.module.ts @@ -26,10 +26,6 @@ import {ResetPasswordComponent} from "./component/reset-password.component"; import {NewPasswordComponent} from "./component/new-password.component"; import {AppProgressIndicationComponent} from "./component/app-progress-indication.component"; import {AppProgressIndicationService} from "./service/app-progress-indication.service"; -import {TaskListComponent} from "./component/task-list.component"; -import {ProcessListComponent} from "./component/process-list.component"; -import {TaskComponent} from "./component/task.component"; -import {TaskNotFoundComponent} from "./component/task-not-found.component"; import {ConfigExecuteBtn} from "../../ervu/ConfigExecuteBtn"; registerLocaleData(localeRu); @@ -46,10 +42,6 @@ export const DIRECTIVES = [ forwardRef(() => ResetPasswordComponent), forwardRef(() => NewPasswordComponent), forwardRef(() => AppProgressIndicationComponent), - forwardRef(() => TaskListComponent), - forwardRef(() => ProcessListComponent), - forwardRef(() => TaskComponent), - forwardRef(() => TaskNotFoundComponent), forwardRef(() => ConfigExecuteBtn) ]; @@ -76,7 +68,7 @@ export const DIRECTIVES = [ { provide: ProgressIndicationService, useClass: AppProgressIndicationService } ], bootstrap: [], - entryComponents: [AppProgressIndicationComponent, TaskNotFoundComponent] + entryComponents: [AppProgressIndicationComponent] }) export class AppModule { } diff --git a/frontend/src/ts/modules/app/component/app-header.component.ts b/frontend/src/ts/modules/app/component/app-header.component.ts index 25a77eb..75c4f24 100644 --- a/frontend/src/ts/modules/app/component/app-header.component.ts +++ b/frontend/src/ts/modules/app/component/app-header.component.ts @@ -17,8 +17,4 @@ export class AppHeaderComponent { protected router: Router) { this.currentSession = this.userService.getCurrentSession(); } - - public openTaskList(): void { - this.router.navigateByUrl("/process/tasks"); - } } diff --git a/frontend/src/ts/modules/app/component/process-list.component.ts b/frontend/src/ts/modules/app/component/process-list.component.ts deleted file mode 100644 index 0b46418..0000000 --- a/frontend/src/ts/modules/app/component/process-list.component.ts +++ /dev/null @@ -1,44 +0,0 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input} from "@angular/core"; -import {Process, TaskService, ProcessDefinitionResource, ProcessService} from "@webbpm/base-package"; - -@Component({ - moduleId: module.id, - selector: 'process', - templateUrl: '../../../../../src/resources/template/app/component/process_list.html', - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class ProcessListComponent { - - @Input() - public processList: Process[]; - @Input() - public errorMessage: string; - - constructor(private processDefinitionResource: ProcessDefinitionResource, - private taskService: TaskService, - private cd: ChangeDetectorRef, - private processService: ProcessService) { - this.processList = []; - this.loadProcessList(); - } - - loadProcessList() { - this.processDefinitionResource.list().then( - (processList) => { - this.processList = processList; - this.cd.markForCheck(); - }, - () => { - this.errorMessage = "Error load process list"; - this.cd.markForCheck(); - }) - } - - startProcess(processDefinitionId: string) { - this.processService.start(processDefinitionId, null).then( - (processInstanceId: number) => { - this.taskService.startAndOpenNextTask(processInstanceId); - } - ); - } -} \ No newline at end of file diff --git a/frontend/src/ts/modules/app/component/task-list.component.ts b/frontend/src/ts/modules/app/component/task-list.component.ts deleted file mode 100644 index 4c27199..0000000 --- a/frontend/src/ts/modules/app/component/task-list.component.ts +++ /dev/null @@ -1,121 +0,0 @@ -import {Component, Input} from "@angular/core"; -import {Task, TaskService, TaskStatus, TaskReference, TaskResource, ProcessVariable, UserService, RolesService, ProcessService} from "@webbpm/base-package"; - -@Component({ - moduleId: module.id, - selector: "task-list", - templateUrl: "../../../../../src/resources/template/app/component/task_list.html" -}) -export class TaskListComponent { - @Input() - public tasks: Task[]; - - @Input() - public onTimeTasks: Task[]; - - @Input() - public overdueTasks: Task[]; - - @Input() - public visibleTasks: Task[]; - - @Input() - public showMode: string; - - @Input() - public errorMessage: string; - - @Input() - public roles: string[]; - - constructor(private taskService: TaskService, - private $taskResource: TaskResource, - private userService: UserService, - private rolesService: RolesService, - private processService: ProcessService) { - this.tasks = []; - this.onTimeTasks = []; - this.overdueTasks = []; - this.visibleTasks = []; - this.roles = []; - this.showMode = 'All'; - - this.rolesService.getRoles().then((roles: string[]) => { - this.roles = roles; - }); - - this.loadTasks(); - } - - private loadTasks(): void { - this.$taskResource.list() - .then( - (tasks: Task[]) => this.initTasks(tasks), - () => this.errorMessage = "Error load tasks" - ); - } - - public startTask(task: Task): Promise { - let taskRef: TaskReference = new TaskReference(); - taskRef.processInstanceId = task.processInstanceId; - taskRef.taskId = task.id; - - if (task.status == TaskStatus.InProgress) { - return this.taskService.openTask(taskRef); - } - else if (task.status == TaskStatus.Reserved || task.status == TaskStatus.Ready) { - return this.taskService.startAndOpenTask(taskRef); - } - } - - private initTasks(tasks: Task[]): void { - this.tasks = tasks; - this.filterOnTimeTasks(); - this.filterOverdueTasks(); - this.filterVisibleTasks(); - } - - public isVisible(task: Task): boolean { - return this.showMode == 'All' || - this.showMode == 'OnTime' && !this.isOverdue(task) || - this.showMode == 'Overdue' && this.isOverdue(task); - } - - public isOverdue(task: Task): boolean { - if (!task.expirationTime) { - return false; - } - return new Date(task.expirationTime).getTime() <= new Date().getTime(); - } - - public isOnTime(task: Task): boolean { - return !this.isOverdue(task); - } - - public startProcess(processDefinitionId: string, processVars?: Array) { - this.processService.start(processDefinitionId, processVars).then( - (processInstanceId: number) => { - this.taskService.startAndOpenNextTask(processInstanceId); - } - ); - } - - public filterOnTimeTasks() { - this.onTimeTasks = this.tasks - .filter((task: Task) => this.isOnTime(task)); - } - - public filterOverdueTasks() { - this.overdueTasks = this.tasks - .filter((task: Task) => this.isOverdue(task)); - } - - public filterVisibleTasks() { - this.visibleTasks = this.tasks - .filter((task: Task) => this.isVisible(task)); - } - - public hasRole(role: string) { - return this.roles.includes(role); - } -} \ No newline at end of file diff --git a/frontend/src/ts/modules/app/component/task-not-found.component.ts b/frontend/src/ts/modules/app/component/task-not-found.component.ts deleted file mode 100644 index 98b6ae4..0000000 --- a/frontend/src/ts/modules/app/component/task-not-found.component.ts +++ /dev/null @@ -1,18 +0,0 @@ -import {ChangeDetectionStrategy, Component} from "@angular/core"; -import {Router} from "@angular/router"; - -@Component({ - moduleId: module.id, - selector: 'task-not-found', - templateUrl: '../../../../../src/resources/template/app/component/task_not_found.html', - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class TaskNotFoundComponent { - - constructor(private router: Router) { - } - - goToTaskList() { - return this.router.navigateByUrl("/process/tasks"); - } -} \ No newline at end of file diff --git a/frontend/src/ts/modules/app/component/task.component.ts b/frontend/src/ts/modules/app/component/task.component.ts deleted file mode 100644 index c0be055..0000000 --- a/frontend/src/ts/modules/app/component/task.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import {Component} from "@angular/core"; - -@Component({ - moduleId: module.id, - selector: "[task]", - templateUrl: "../../../../../src/resources/template/app/component/task.html" -}) -export class TaskComponent { -} \ No newline at end of file diff --git a/frontend/src/ts/modules/preview/preview.module.ts b/frontend/src/ts/modules/preview/preview.module.ts index a281717..47a0066 100644 --- a/frontend/src/ts/modules/preview/preview.module.ts +++ b/frontend/src/ts/modules/preview/preview.module.ts @@ -9,7 +9,6 @@ import {NgbModule} from "@ng-bootstrap/ng-bootstrap"; import {ToastNoAnimationModule} from "ngx-toastr"; import {AppModule} from "../app/app.module"; import {ComponentsModule, CoreModule, SecurityModule} from "@webbpm/base-package"; -import {TaskParamsProvider} from "@webbpm/base-package"; import {HTTP_INTERCEPTORS} from "@angular/common/http"; import {HttpPreviewInterceptor} from "./service/http-preview-interceptor.service"; @@ -38,7 +37,6 @@ let IMPORTS = [ ], exports: [], providers: [ - TaskParamsProvider, HTTP_INTERCEPTOR_PROVIDERS ], bootstrap: [ diff --git a/frontend/src/ts/modules/webbpm/webbpm.module.ts b/frontend/src/ts/modules/webbpm/webbpm.module.ts index 427c848..c346431 100644 --- a/frontend/src/ts/modules/webbpm/webbpm.module.ts +++ b/frontend/src/ts/modules/webbpm/webbpm.module.ts @@ -15,8 +15,6 @@ import { CoreModule, SecurityModule, } from "@webbpm/base-package"; -import {TaskParamsProvider} from "@webbpm/base-package"; -import {ProcessInstanceParamsProvider} from "@webbpm/base-package"; import {AppRoutingModule} from "../app/app-routing.module"; import {AppJivoChatWidgetService} from "../app/service/app-jivo-chat.service"; import {UserManagementRoutingModule} from "./user-management-routing.module"; @@ -48,8 +46,6 @@ let IMPORTS = [ ], exports: [], providers: [ - TaskParamsProvider, - ProcessInstanceParamsProvider, AppJivoChatWidgetService, {provide: ErrorHandler, useClass: GlobalErrorHandler}, DEFAULT_HTTP_INTERCEPTOR_PROVIDERS diff --git a/resources/src/main/resources/business-model/Процессы/process-instance-list.page b/resources/src/main/resources/business-model/Процессы/process-instance-list.page deleted file mode 100644 index e4220e9..0000000 --- a/resources/src/main/resources/business-model/Процессы/process-instance-list.page +++ /dev/null @@ -1,211 +0,0 @@ - - - process-instance-list - - 3.180.0 - - - ru.cg.webbpm.packages.base.resources - 3.180.0 - - - - - fe225a1a-1c03-485e-a069-18b92ab4f7f7 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - ProcessInstanceList - true - false - - - - - - - e24cd1b9-23e0-48dc-b0bf-60d2d1658494 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Текст - false - false - - - - - - - - b42176d1-e538-45fb-aeb6-f51390228082 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Группа фильтров - true - false - - - - filterableComp - - null - - - - - - - - filterable - - {"objectId":"3b06ffb8-18ef-4e69-8475-a105542a1737","packageName":"rpc","className":"GridRpcService","type":"JAVA"} - - - - - - - - - - cc38963d-5d25-44f9-b3ff-6a308c811ce9 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Текст - false - false - - - - - - - - 435a96a3-17b3-4f07-a5bf-f3b6270fc45b - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Статичный переключатель - false - false - - - - - - - - - - - dd251ec9-8b42-4d52-b203-6e5bc158b235 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Горизонтальный контейнер - true - false - - - - - service - - - DefaultValueLoaderServiceImpl - service.loading - - - - - - - - - - 9de40b60-d339-4899-baeb-ab41db339380 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Фильтр по дате (с) - false - false - - - - - - - - - 0880e07c-1abf-428a-99ba-eedfb725b71e - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Фильтр по дате (по) - false - false - - - - - - - - - bdb3cecd-7a0b-4027-b9c5-591119171cf7 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Фильтр по наименованию - false - false - - - - - - - - - - - 5f560694-8ded-4d0c-b75c-b4c41c58d48c - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Вертикальный контейнер - true - false - - - - - - - 6443c41a-8c07-4ef7-98cf-0c2d76884dfd - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Горизонтальный контейнер - true - false - - - - - - - 61db7e91-9ace-418a-8a0d-d81877411d62 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Кнопка выбора - false - false - - - - 6c8d958f-4e3a-4606-be55-4ff9a6640cc7 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Кнопка выбора - false - false - - - - - - 3b06ffb8-18ef-4e69-8475-a105542a1737 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Таблица - false - false - - - - - - - - - diff --git a/resources/src/main/resources/business-model/Процессы/process-instance.page b/resources/src/main/resources/business-model/Процессы/process-instance.page deleted file mode 100644 index 27842dd..0000000 --- a/resources/src/main/resources/business-model/Процессы/process-instance.page +++ /dev/null @@ -1,251 +0,0 @@ - - - process-instance - - 3.180.0 - - - ru.cg.webbpm.packages.base.resources - 3.180.0 - - - - - 2bb8a14d-6a69-43c5-9c0e-c301f982d26f - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - ProcessInstance - true - false - - - - - service - - - DefaultValueLoaderServiceImpl - service.loading - - - - - - - - - - 3800a37f-56d0-4c92-9597-ec0a4c2e4e13 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - Text - false - false - - - - - - - - - - fd2c1c62-f6f2-4460-b93a-bf737a0dfcb1 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - TabContainer - true - false - - - - - service - - -DefaultValueLoaderServiceImpl -service.loading - - - - - - - - - - d6f9a5b1-6456-4961-a243-18e8a5b53fbf - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - TabItem - true - false - - - - - service - - - DefaultValueLoaderServiceImpl - service.loading - - - - - - - - - - de8f0d04-844d-43c6-97be-afc06678d452 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - HBox - true - false - - - - -service - - - DefaultValueLoaderServiceImpl - service.loading - - - - - - - - - - 415990b0-79a9-40c2-99c9-0fe30b3f8680 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - SelectButton - false - false - - - - 4f869d1a-4678-4869-a82d-6397d0f566dd - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - SelectButton - false - false - - - - - 8f7e43aa-831f-4b3e-a942-9b3edaa98ebc - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - Grid - false - false - - - - - - - - 41638fc1-45eb-4edb-b0a1-904869e3996a - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - TabItem - true - false - - - - - service - - - DefaultValueLoaderServiceImpl - service.loading - - - - - - - - - - a5062a8d-c311-4250-a632-b87c766ef797 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - Флаг - false - false - - - - - - - - 79275d69-0eac-4e16-842b-0cc4b8a8f455 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - TextArea - false - false - - - - - - - - - b0f923b7-60c1-4246-b7ee-d244f65fe233 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - Обработка событий - false - false - - true - - - - - - 6b11ca6b-f757-481b-b4a6-46d1528464ca - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - TabItem - true - false - - - - - service - - - DefaultValueLoaderServiceImpl - service.loading - - - - - - - - - - 37ac294e-b21f-4ec9-8fc2-ff9d137baf5b - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - ProcessInstanceDiagram - false - false - - - - - - - 9c9c7512-4ec6-459d-b173-cda11ca789c4 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - Button - false - false - - - -