diff --git a/apps/maarch_entreprise/Views/action-administration.component.html b/apps/maarch_entreprise/Views/action-administration.component.html
index 25874c26669a5604023d33a44101c31fae15e2bd..b66fb0e1a812a0402be5a09a35ccbd79b7834cb6 100644
--- a/apps/maarch_entreprise/Views/action-administration.component.html
+++ b/apps/maarch_entreprise/Views/action-administration.component.html
@@ -1,6 +1,3 @@
-<div id="resultInfo" class="fade" style="display:none;">
- {{resultInfo}}
-</div>
<div *ngIf="loading">
<i class="fa fa-spinner fa-spin fa-5x" style="margin-left: 50%;margin-top: 16%;font-size: 8em"></i>
</div>
diff --git a/apps/maarch_entreprise/js/angular/app/action-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/action-administration.component.js
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/action-administration.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/action-administration.component.js
diff --git a/apps/maarch_entreprise/js/angular/app/action-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/action-administration.component.ts
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/action-administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/action-administration.component.ts
diff --git a/apps/maarch_entreprise/js/angular/app/actions-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.js
similarity index 98%
rename from apps/maarch_entreprise/js/angular/app/actions-administration.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.js
index 7aa9d3d4689f804bef6e30af88db671919b2dcb1..ec65e4378b33ddddbdd560c40ebd1156341c5a90 100644
--- a/apps/maarch_entreprise/js/angular/app/actions-administration.component.js
+++ b/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.js
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
Object.defineProperty(exports, "__esModule", { value: true });
var core_1 = require("@angular/core");
var http_1 = require("@angular/common/http");
-var translate_component_1 = require("./translate.component");
+var translate_component_1 = require("../translate.component");
var ActionsAdministrationComponent = (function () {
function ActionsAdministrationComponent(http) {
this.http = http;
diff --git a/apps/maarch_entreprise/js/angular/app/actions-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts
similarity index 98%
rename from apps/maarch_entreprise/js/angular/app/actions-administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts
index 6c550377aedd09ec301373e3f2f90bf8e8b5f8e4..81a6ca7c290221fc57e287c7654c84d8dd353c8d 100644
--- a/apps/maarch_entreprise/js/angular/app/actions-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http';
-import { LANG } from './translate.component';
+import { LANG } from '../translate.component';
declare function $j(selector: any) : any;
declare function successNotification(message: string) : void;
diff --git a/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.js b/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.js
new file mode 100644
index 0000000000000000000000000000000000000000..0c404ca50bdbe3075c749a716b5da75af2c0bd3b
--- /dev/null
+++ b/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.js
@@ -0,0 +1,56 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var core_1 = require("@angular/core");
+var router_1 = require("@angular/router");
+var administration_component_1 = require("./administration.component");
+var users_administration_component_1 = require("./users-administration.component");
+var user_administration_component_1 = require("./user-administration.component");
+var statuses_administration_component_1 = require("./statuses-administration.component");
+var status_administration_component_1 = require("./status-administration.component");
+var actions_administration_component_1 = require("./actions-administration.component");
+var action_administration_component_1 = require("./action-administration.component");
+var parameter_administration_component_1 = require("./parameter-administration.component");
+var parameters_administration_component_1 = require("./parameters-administration.component");
+var priorities_administration_component_1 = require("./priorities-administration.component");
+var priority_administration_component_1 = require("./priority-administration.component");
+var reports_administration_component_1 = require("./reports-administration.component");
+var AdministrationRoutingModule = (function () {
+ function AdministrationRoutingModule() {
+ }
+ return AdministrationRoutingModule;
+}());
+AdministrationRoutingModule = __decorate([
+ core_1.NgModule({
+ imports: [
+ router_1.RouterModule.forChild([
+ { path: 'administration', component: administration_component_1.AdministrationComponent },
+ { path: 'administration/users', component: users_administration_component_1.UsersAdministrationComponent },
+ { path: 'administration/users/new', component: user_administration_component_1.UserAdministrationComponent },
+ { path: 'administration/users/:id', component: user_administration_component_1.UserAdministrationComponent },
+ { path: 'administration/status', component: statuses_administration_component_1.StatusesAdministrationComponent },
+ { path: 'administration/status/new', component: status_administration_component_1.StatusAdministrationComponent },
+ { path: 'administration/status/:identifier', component: status_administration_component_1.StatusAdministrationComponent },
+ { path: 'administration/parameters', component: parameters_administration_component_1.ParametersAdministrationComponent },
+ { path: 'administration/parameters/new', component: parameter_administration_component_1.ParameterAdministrationComponent },
+ { path: 'administration/parameters/:id', component: parameter_administration_component_1.ParameterAdministrationComponent },
+ { path: 'administration/reports', component: reports_administration_component_1.ReportsAdministrationComponent },
+ { path: 'administration/priorities', component: priorities_administration_component_1.PrioritiesAdministrationComponent },
+ { path: 'administration/priorities/new', component: priority_administration_component_1.PriorityAdministrationComponent },
+ { path: 'administration/priorities/:id', component: priority_administration_component_1.PriorityAdministrationComponent },
+ { path: 'administration/actions', component: actions_administration_component_1.ActionsAdministrationComponent },
+ { path: 'administration/actions/new', component: action_administration_component_1.ActionAdministrationComponent },
+ { path: 'administration/actions/:id', component: action_administration_component_1.ActionAdministrationComponent },
+ ]),
+ ],
+ exports: [
+ router_1.RouterModule
+ ]
+ })
+], AdministrationRoutingModule);
+exports.AdministrationRoutingModule = AdministrationRoutingModule;
diff --git a/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.ts b/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8293644f34168dc2bdba13edf517acc820cf8014
--- /dev/null
+++ b/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.ts
@@ -0,0 +1,44 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { AdministrationComponent } from './administration.component';
+import { UsersAdministrationComponent } from './users-administration.component';
+import { UserAdministrationComponent } from './user-administration.component';
+import { StatusesAdministrationComponent } from './statuses-administration.component';
+import { StatusAdministrationComponent } from './status-administration.component';
+import { ActionsAdministrationComponent } from './actions-administration.component';
+import { ActionAdministrationComponent } from './action-administration.component';
+import { ParameterAdministrationComponent } from './parameter-administration.component';
+import { ParametersAdministrationComponent } from './parameters-administration.component';
+import { PrioritiesAdministrationComponent } from './priorities-administration.component';
+import { PriorityAdministrationComponent } from './priority-administration.component';
+import { ReportsAdministrationComponent } from './reports-administration.component';
+
+
+@NgModule({
+ imports: [
+ RouterModule.forChild([
+ { path: 'administration', component: AdministrationComponent },
+ { path: 'administration/users', component: UsersAdministrationComponent },
+ { path: 'administration/users/new', component: UserAdministrationComponent },
+ { path: 'administration/users/:id', component: UserAdministrationComponent },
+ { path: 'administration/status', component: StatusesAdministrationComponent },
+ { path: 'administration/status/new', component: StatusAdministrationComponent },
+ { path: 'administration/status/:identifier', component: StatusAdministrationComponent },
+ { path: 'administration/parameters', component: ParametersAdministrationComponent },
+ { path: 'administration/parameters/new', component: ParameterAdministrationComponent },
+ { path: 'administration/parameters/:id', component: ParameterAdministrationComponent },
+ { path: 'administration/reports', component : ReportsAdministrationComponent},
+ { path: 'administration/priorities', component : PrioritiesAdministrationComponent },
+ { path: 'administration/priorities/new', component : PriorityAdministrationComponent },
+ { path: 'administration/priorities/:id', component : PriorityAdministrationComponent },
+ { path: 'administration/actions', component: ActionsAdministrationComponent },
+ { path: 'administration/actions/new', component: ActionAdministrationComponent },
+ { path: 'administration/actions/:id', component: ActionAdministrationComponent },
+ ]),
+ ],
+ exports: [
+ RouterModule
+ ]
+})
+export class AdministrationRoutingModule {}
diff --git a/apps/maarch_entreprise/js/angular/app/administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/administration.component.js
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/administration.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/administration.component.js
diff --git a/apps/maarch_entreprise/js/angular/app/administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/administration.component.ts
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/administration.component.ts
diff --git a/apps/maarch_entreprise/js/angular/app/administration/administration.module.js b/apps/maarch_entreprise/js/angular/app/administration/administration.module.js
new file mode 100644
index 0000000000000000000000000000000000000000..279780e41a7926eb9e58eaf48b2e7294a087098a
--- /dev/null
+++ b/apps/maarch_entreprise/js/angular/app/administration/administration.module.js
@@ -0,0 +1,55 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var core_1 = require("@angular/core");
+var common_1 = require("@angular/common");
+var forms_1 = require("@angular/forms");
+var http_1 = require("@angular/common/http");
+var administration_routing_module_1 = require("./administration-routing.module");
+var administration_component_1 = require("./administration.component");
+var users_administration_component_1 = require("./users-administration.component");
+var user_administration_component_1 = require("./user-administration.component");
+var statuses_administration_component_1 = require("./statuses-administration.component");
+var status_administration_component_1 = require("./status-administration.component");
+var actions_administration_component_1 = require("./actions-administration.component");
+var action_administration_component_1 = require("./action-administration.component");
+var parameters_administration_component_1 = require("./parameters-administration.component");
+var parameter_administration_component_1 = require("./parameter-administration.component");
+var priorities_administration_component_1 = require("./priorities-administration.component");
+var priority_administration_component_1 = require("./priority-administration.component");
+var reports_administration_component_1 = require("./reports-administration.component");
+var AdministrationModule = (function () {
+ function AdministrationModule() {
+ }
+ return AdministrationModule;
+}());
+AdministrationModule = __decorate([
+ core_1.NgModule({
+ imports: [
+ common_1.CommonModule,
+ forms_1.FormsModule,
+ http_1.HttpClientModule,
+ administration_routing_module_1.AdministrationRoutingModule
+ ],
+ declarations: [
+ administration_component_1.AdministrationComponent,
+ users_administration_component_1.UsersAdministrationComponent,
+ user_administration_component_1.UserAdministrationComponent,
+ statuses_administration_component_1.StatusesAdministrationComponent,
+ status_administration_component_1.StatusAdministrationComponent,
+ actions_administration_component_1.ActionsAdministrationComponent,
+ action_administration_component_1.ActionAdministrationComponent,
+ parameters_administration_component_1.ParametersAdministrationComponent,
+ parameter_administration_component_1.ParameterAdministrationComponent,
+ priorities_administration_component_1.PrioritiesAdministrationComponent,
+ priority_administration_component_1.PriorityAdministrationComponent,
+ reports_administration_component_1.ReportsAdministrationComponent
+ ]
+ })
+], AdministrationModule);
+exports.AdministrationModule = AdministrationModule;
diff --git a/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts b/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ffac2588856b932156f8f3eb4523fa7043b8fb72
--- /dev/null
+++ b/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts
@@ -0,0 +1,43 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { HttpClientModule } from '@angular/common/http';
+
+import { AdministrationRoutingModule } from './administration-routing.module';
+
+import { AdministrationComponent } from './administration.component';
+import { UsersAdministrationComponent } from './users-administration.component';
+import { UserAdministrationComponent } from './user-administration.component';
+import { StatusesAdministrationComponent } from './statuses-administration.component';
+import { StatusAdministrationComponent } from './status-administration.component';
+import { ActionsAdministrationComponent } from './actions-administration.component';
+import { ActionAdministrationComponent } from './action-administration.component';
+import { ParametersAdministrationComponent } from './parameters-administration.component';
+import { ParameterAdministrationComponent } from './parameter-administration.component';
+import { PrioritiesAdministrationComponent } from './priorities-administration.component';
+import { PriorityAdministrationComponent } from './priority-administration.component';
+import { ReportsAdministrationComponent } from './reports-administration.component';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ HttpClientModule,
+ AdministrationRoutingModule
+ ],
+ declarations: [
+ AdministrationComponent,
+ UsersAdministrationComponent,
+ UserAdministrationComponent,
+ StatusesAdministrationComponent,
+ StatusAdministrationComponent,
+ ActionsAdministrationComponent,
+ ActionAdministrationComponent,
+ ParametersAdministrationComponent,
+ ParameterAdministrationComponent,
+ PrioritiesAdministrationComponent,
+ PriorityAdministrationComponent,
+ ReportsAdministrationComponent
+ ]
+})
+export class AdministrationModule { }
\ No newline at end of file
diff --git a/apps/maarch_entreprise/js/angular/app/parameter-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/parameter-administration.component.js
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/parameter-administration.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/parameter-administration.component.js
diff --git a/apps/maarch_entreprise/js/angular/app/parameter-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/parameter-administration.component.ts
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/parameter-administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/parameter-administration.component.ts
diff --git a/apps/maarch_entreprise/js/angular/app/parameters-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/parameters-administration.component.js
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/parameters-administration.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/parameters-administration.component.js
diff --git a/apps/maarch_entreprise/js/angular/app/parameters-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/parameters-administration.component.ts
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/parameters-administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/parameters-administration.component.ts
diff --git a/apps/maarch_entreprise/js/angular/app/priorities-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.js
similarity index 98%
rename from apps/maarch_entreprise/js/angular/app/priorities-administration.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.js
index 3c0dfc046b513d97a0dbdb27a9483f5ecfc41ec1..d4f499b88895ff608849b0b19561ade3774f3092 100644
--- a/apps/maarch_entreprise/js/angular/app/priorities-administration.component.js
+++ b/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.js
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
Object.defineProperty(exports, "__esModule", { value: true });
var core_1 = require("@angular/core");
var http_1 = require("@angular/common/http");
-var translate_component_1 = require("./translate.component");
+var translate_component_1 = require("../translate.component");
var PrioritiesAdministrationComponent = (function () {
function PrioritiesAdministrationComponent(http) {
this.http = http;
diff --git a/apps/maarch_entreprise/js/angular/app/priorities-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.ts
similarity index 98%
rename from apps/maarch_entreprise/js/angular/app/priorities-administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.ts
index 6720c2993055407fd9da9f5306ce87750f9aee26..aaaece2f584e2c140a4fa9321950093b226daf3d 100644
--- a/apps/maarch_entreprise/js/angular/app/priorities-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/priorities-administration.component.ts
@@ -1,6 +1,6 @@
import { Component, OnInit} from '@angular/core';
import { HttpClient } from '@angular/common/http';
-import { LANG } from './translate.component';
+import { LANG } from '../translate.component';
declare function $j(selector: any) : any;
declare function successNotification(message: string) : void;
diff --git a/apps/maarch_entreprise/js/angular/app/priority-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.js
similarity index 98%
rename from apps/maarch_entreprise/js/angular/app/priority-administration.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.js
index 897a3c29b34b4fc278640b71c0c8a3a24aa0998f..6f87efcb72c3c427de3bdfcef814ea15f1b1532b 100644
--- a/apps/maarch_entreprise/js/angular/app/priority-administration.component.js
+++ b/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.js
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
var core_1 = require("@angular/core");
var http_1 = require("@angular/common/http");
var router_1 = require("@angular/router");
-var translate_component_1 = require("./translate.component");
+var translate_component_1 = require("../translate.component");
var PriorityAdministrationComponent = (function () {
function PriorityAdministrationComponent(http, route, router) {
this.http = http;
diff --git a/apps/maarch_entreprise/js/angular/app/priority-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.ts
similarity index 98%
rename from apps/maarch_entreprise/js/angular/app/priority-administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.ts
index 0707966b20acc6e3f28959480e58099a7a855a51..2692571df58aab009f7855a650f94bb0161dd179 100644
--- a/apps/maarch_entreprise/js/angular/app/priority-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/priority-administration.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit} from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Router, ActivatedRoute } from '@angular/router';
-import { LANG } from './translate.component';
+import { LANG } from '../translate.component';
declare function $j(selector: any) : any;
declare function successNotification(message: string) : void;
diff --git a/apps/maarch_entreprise/js/angular/app/reports.component.js b/apps/maarch_entreprise/js/angular/app/administration/reports-administration.component.js
similarity index 79%
rename from apps/maarch_entreprise/js/angular/app/reports.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/reports-administration.component.js
index be681dbe70b3aeb161efc9a115ff4a08832dc6b3..42e25d1ca150d746d5ca318b3db744e39474fc28 100644
--- a/apps/maarch_entreprise/js/angular/app/reports.component.js
+++ b/apps/maarch_entreprise/js/angular/app/administration/reports-administration.component.js
@@ -11,17 +11,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
Object.defineProperty(exports, "__esModule", { value: true });
var core_1 = require("@angular/core");
var http_1 = require("@angular/common/http");
-var ReportsComponent = (function () {
- function ReportsComponent(http) {
+var ReportsAdministrationComponent = (function () {
+ function ReportsAdministrationComponent(http) {
this.http = http;
this.test42 = "Ptit test OKLM";
this.arrayArgsPut = [];
this.lang = [];
}
- ReportsComponent.prototype.prepareState = function () {
+ ReportsAdministrationComponent.prototype.prepareState = function () {
$j('#inner_content').remove();
};
- ReportsComponent.prototype.ngOnInit = function () {
+ ReportsAdministrationComponent.prototype.ngOnInit = function () {
var _this = this;
this.prepareState();
this.coreUrl = angularGlobals.coreUrl;
@@ -31,7 +31,7 @@ var ReportsComponent = (function () {
_this.lang = data['lang'];
});
};
- ReportsComponent.prototype.loadGroup = function () {
+ ReportsAdministrationComponent.prototype.loadGroup = function () {
var _this = this;
this.http.get(this.coreUrl + 'rest/report/groups/' + this.groups[$j("#group_id").prop("selectedIndex") - 1].group_id) // SELECTED ANDGULAR .selected()
.subscribe(function (data) {
@@ -40,11 +40,11 @@ var ReportsComponent = (function () {
});
$j("#formCategoryId").removeClass("hide");
};
- ReportsComponent.prototype.clickOnCategory = function (id) {
+ ReportsAdministrationComponent.prototype.clickOnCategory = function (id) {
$j(".category").addClass("hide");
$j("#" + id).removeClass("hide");
};
- ReportsComponent.prototype.updateDB = function () {
+ ReportsAdministrationComponent.prototype.updateDB = function () {
var _this = this;
for (var i = 0; i < $j(":checkbox").length; i++) {
this.arrayArgsPut.push({ id: this.checkboxes[i].id, checked: $j(":checkbox")[i].checked });
@@ -55,13 +55,13 @@ var ReportsComponent = (function () {
_this.arrayArgsPut = [];
});
};
- return ReportsComponent;
+ return ReportsAdministrationComponent;
}());
-ReportsComponent = __decorate([
+ReportsAdministrationComponent = __decorate([
core_1.Component({
templateUrl: 'Views/reports.component.html',
styleUrls: ['../../node_modules/bootstrap/dist/css/bootstrap.min.css', '../maarch_entreprise/css/reports.css']
}),
__metadata("design:paramtypes", [http_1.HttpClient])
-], ReportsComponent);
-exports.ReportsComponent = ReportsComponent;
+], ReportsAdministrationComponent);
+exports.ReportsAdministrationComponent = ReportsAdministrationComponent;
diff --git a/apps/maarch_entreprise/js/angular/app/reports.component.ts b/apps/maarch_entreprise/js/angular/app/administration/reports-administration.component.ts
similarity index 97%
rename from apps/maarch_entreprise/js/angular/app/reports.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/reports-administration.component.ts
index b640ddb4c405bc585b985fd93de56cb1a0b87346..1755a3a3790a1c0839087a59e245b55215f786ea 100644
--- a/apps/maarch_entreprise/js/angular/app/reports.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/reports-administration.component.ts
@@ -8,7 +8,7 @@ declare var angularGlobals : any;
templateUrl : 'Views/reports.component.html',
styleUrls : ['../../node_modules/bootstrap/dist/css/bootstrap.min.css', '../maarch_entreprise/css/reports.css']
})
-export class ReportsComponent implements OnInit
+export class ReportsAdministrationComponent implements OnInit
{
test42 : string = "Ptit test OKLM";
diff --git a/apps/maarch_entreprise/js/angular/app/status-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/status-administration.component.js
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/status-administration.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/status-administration.component.js
diff --git a/apps/maarch_entreprise/js/angular/app/status-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/status-administration.component.ts
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/status-administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/status-administration.component.ts
diff --git a/apps/maarch_entreprise/js/angular/app/status-list-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.js
similarity index 87%
rename from apps/maarch_entreprise/js/angular/app/status-list-administration.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.js
index 0da04658a7aa155f77f4f3c4da152c58993ad008..d200a51aa207c09c7125853b0976b70d390c6671 100644
--- a/apps/maarch_entreprise/js/angular/app/status-list-administration.component.js
+++ b/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.js
@@ -11,14 +11,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
Object.defineProperty(exports, "__esModule", { value: true });
var core_1 = require("@angular/core");
var http_1 = require("@angular/common/http");
-var StatusListAdministrationComponent = (function () {
- function StatusListAdministrationComponent(http) {
+var StatusesAdministrationComponent = (function () {
+ function StatusesAdministrationComponent(http) {
this.http = http;
this.lang = "";
this.resultInfo = "";
this.loading = false;
}
- StatusListAdministrationComponent.prototype.ngOnInit = function () {
+ StatusesAdministrationComponent.prototype.ngOnInit = function () {
var _this = this;
this.coreUrl = angularGlobals.coreUrl;
this.prepareStatus();
@@ -64,14 +64,14 @@ var StatusListAdministrationComponent = (function () {
errorNotification(JSON.parse(err._body).errors);
});
};
- StatusListAdministrationComponent.prototype.prepareStatus = function () {
+ StatusesAdministrationComponent.prototype.prepareStatus = function () {
$j('#inner_content').remove();
};
- StatusListAdministrationComponent.prototype.updateBreadcrumb = function (applicationName) {
+ StatusesAdministrationComponent.prototype.updateBreadcrumb = function (applicationName) {
$j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > " +
"<a onclick='location.hash = \"/administration\"' style='cursor: pointer'>" + this.lang.admin + "</a> > " + this.lang.admin_status;
};
- StatusListAdministrationComponent.prototype.deleteStatus = function (statusId, statusIdentifier) {
+ StatusesAdministrationComponent.prototype.deleteStatus = function (statusId, statusIdentifier) {
var _this = this;
var resp = confirm(this.lang.deleteConfirm + ' ' + statusId + '?');
if (resp) {
@@ -91,13 +91,13 @@ var StatusListAdministrationComponent = (function () {
});
}
};
- return StatusListAdministrationComponent;
+ return StatusesAdministrationComponent;
}());
-StatusListAdministrationComponent = __decorate([
+StatusesAdministrationComponent = __decorate([
core_1.Component({
templateUrl: angularGlobals['statuses-administrationView'],
styleUrls: ['../../node_modules/bootstrap/dist/css/bootstrap.min.css']
}),
__metadata("design:paramtypes", [http_1.HttpClient])
-], StatusListAdministrationComponent);
-exports.StatusListAdministrationComponent = StatusListAdministrationComponent;
+], StatusesAdministrationComponent);
+exports.StatusesAdministrationComponent = StatusesAdministrationComponent;
diff --git a/apps/maarch_entreprise/js/angular/app/status-list-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.ts
similarity index 98%
rename from apps/maarch_entreprise/js/angular/app/status-list-administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.ts
index 46029e6d190e661db499ea1fbd88ae4c851820c8..18f0618ff55aba2396da017b877f0c8aa2578a5d 100644
--- a/apps/maarch_entreprise/js/angular/app/status-list-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.ts
@@ -12,7 +12,7 @@ declare var angularGlobals : any;
templateUrl : angularGlobals['statuses-administrationView'],
styleUrls : ['../../node_modules/bootstrap/dist/css/bootstrap.min.css']
})
-export class StatusListAdministrationComponent implements OnInit {
+export class StatusesAdministrationComponent implements OnInit {
coreUrl : string;
nbStatus : number;
lang : any = "";
diff --git a/apps/maarch_entreprise/js/angular/app/user-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/user-administration.component.js
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/user-administration.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/user-administration.component.js
diff --git a/apps/maarch_entreprise/js/angular/app/user-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/user-administration.component.ts
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/user-administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/user-administration.component.ts
diff --git a/apps/maarch_entreprise/js/angular/app/users-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/users-administration.component.js
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/users-administration.component.js
rename to apps/maarch_entreprise/js/angular/app/administration/users-administration.component.js
diff --git a/apps/maarch_entreprise/js/angular/app/users-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/users-administration.component.ts
similarity index 100%
rename from apps/maarch_entreprise/js/angular/app/users-administration.component.ts
rename to apps/maarch_entreprise/js/angular/app/administration/users-administration.component.ts
diff --git a/apps/maarch_entreprise/js/angular/app/app-routing.module.js b/apps/maarch_entreprise/js/angular/app/app-routing.module.js
new file mode 100644
index 0000000000000000000000000000000000000000..1a66044a5941d519c3c59aed328b71461c179f72
--- /dev/null
+++ b/apps/maarch_entreprise/js/angular/app/app-routing.module.js
@@ -0,0 +1,32 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var core_1 = require("@angular/core");
+var router_1 = require("@angular/router");
+var profile_component_1 = require("./profile.component");
+var signature_book_component_1 = require("./signature-book.component");
+var AppRoutingModule = (function () {
+ function AppRoutingModule() {
+ }
+ return AppRoutingModule;
+}());
+AppRoutingModule = __decorate([
+ core_1.NgModule({
+ imports: [
+ router_1.RouterModule.forRoot([
+ { path: 'profile', component: profile_component_1.ProfileComponent },
+ { path: ':basketId/signatureBook/:resId', component: signature_book_component_1.SignatureBookComponent },
+ { path: '**', redirectTo: '', pathMatch: 'full' },
+ ], { useHash: true }),
+ ],
+ exports: [
+ router_1.RouterModule
+ ]
+ })
+], AppRoutingModule);
+exports.AppRoutingModule = AppRoutingModule;
diff --git a/apps/maarch_entreprise/js/angular/app/app-routing.module.ts b/apps/maarch_entreprise/js/angular/app/app-routing.module.ts
new file mode 100644
index 0000000000000000000000000000000000000000..9d6952a0e7e0eb15bfef679905fce0a4ed351126
--- /dev/null
+++ b/apps/maarch_entreprise/js/angular/app/app-routing.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { ProfileComponent } from './profile.component';
+import { SignatureBookComponent, SafeUrlPipe } from './signature-book.component';
+
+
+@NgModule({
+ imports: [
+ RouterModule.forRoot([
+ { path: 'profile', component: ProfileComponent },
+ { path: ':basketId/signatureBook/:resId', component: SignatureBookComponent },
+ { path: '**', redirectTo: '', pathMatch: 'full' },
+ ], { useHash: true }),
+ ],
+ exports: [
+ RouterModule
+ ]
+})
+export class AppRoutingModule {}
diff --git a/apps/maarch_entreprise/js/angular/app/app.module.js b/apps/maarch_entreprise/js/angular/app/app.module.js
index 001b372e019d10591b63614b7cd91a1310ff5fef..2eaae633f41f66bd2d9ff1055aa326d8c66e6eb0 100644
--- a/apps/maarch_entreprise/js/angular/app/app.module.js
+++ b/apps/maarch_entreprise/js/angular/app/app.module.js
@@ -8,24 +8,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
Object.defineProperty(exports, "__esModule", { value: true });
var core_1 = require("@angular/core");
var platform_browser_1 = require("@angular/platform-browser");
-var router_1 = require("@angular/router");
var forms_1 = require("@angular/forms");
-var http_1 = require("@angular/common/http");
var app_component_1 = require("./app.component");
-var administration_component_1 = require("./administration.component");
-var users_administration_component_1 = require("./users-administration.component");
-var user_administration_component_1 = require("./user-administration.component");
-var status_list_administration_component_1 = require("./status-list-administration.component");
-var status_administration_component_1 = require("./status-administration.component");
-var actions_administration_component_1 = require("./actions-administration.component");
-var action_administration_component_1 = require("./action-administration.component");
-var parameter_administration_component_1 = require("./parameter-administration.component");
-var parameters_administration_component_1 = require("./parameters-administration.component");
-var priorities_administration_component_1 = require("./priorities-administration.component");
-var priority_administration_component_1 = require("./priority-administration.component");
+var app_routing_module_1 = require("./app-routing.module");
+var administration_module_1 = require("./administration/administration.module");
var profile_component_1 = require("./profile.component");
var signature_book_component_1 = require("./signature-book.component");
-var reports_component_1 = require("./reports.component");
var AppModule = (function () {
function AppModule() {
}
@@ -35,46 +23,13 @@ AppModule = __decorate([
core_1.NgModule({
imports: [
platform_browser_1.BrowserModule,
- //DataTablesModule,
forms_1.FormsModule,
- router_1.RouterModule.forRoot([
- { path: 'administration', component: administration_component_1.AdministrationComponent },
- { path: 'administration/users', component: users_administration_component_1.UsersAdministrationComponent },
- { path: 'administration/users/new', component: user_administration_component_1.UserAdministrationComponent },
- { path: 'administration/users/:id', component: user_administration_component_1.UserAdministrationComponent },
- { path: 'administration/status', component: status_list_administration_component_1.StatusListAdministrationComponent },
- { path: 'administration/status/new', component: status_administration_component_1.StatusAdministrationComponent },
- { path: 'administration/status/:identifier', component: status_administration_component_1.StatusAdministrationComponent },
- { path: 'profile', component: profile_component_1.ProfileComponent },
- { path: 'administration/parameters', component: parameters_administration_component_1.ParametersAdministrationComponent },
- { path: 'administration/parameters/new', component: parameter_administration_component_1.ParameterAdministrationComponent },
- { path: 'administration/parameters/:id', component: parameter_administration_component_1.ParameterAdministrationComponent },
- { path: 'administration/reports', component: reports_component_1.ReportsComponent },
- { path: 'administration/priorities', component: priorities_administration_component_1.PrioritiesAdministrationComponent },
- { path: 'administration/priorities/new', component: priority_administration_component_1.PriorityAdministrationComponent },
- { path: 'administration/priorities/:id', component: priority_administration_component_1.PriorityAdministrationComponent },
- { path: ':basketId/signatureBook/:resId', component: signature_book_component_1.SignatureBookComponent },
- { path: 'administration/actions', component: actions_administration_component_1.ActionsAdministrationComponent },
- { path: 'administration/actions/new', component: action_administration_component_1.ActionAdministrationComponent },
- { path: 'administration/actions/:id', component: action_administration_component_1.ActionAdministrationComponent },
- { path: '**', redirectTo: '', pathMatch: 'full' },
- ], { useHash: true }),
- http_1.HttpClientModule
+ //HttpClientModule,
+ administration_module_1.AdministrationModule,
+ app_routing_module_1.AppRoutingModule
],
declarations: [
app_component_1.AppComponent,
- action_administration_component_1.ActionAdministrationComponent,
- actions_administration_component_1.ActionsAdministrationComponent,
- administration_component_1.AdministrationComponent,
- reports_component_1.ReportsComponent,
- users_administration_component_1.UsersAdministrationComponent,
- user_administration_component_1.UserAdministrationComponent,
- status_administration_component_1.StatusAdministrationComponent,
- status_list_administration_component_1.StatusListAdministrationComponent,
- priorities_administration_component_1.PrioritiesAdministrationComponent,
- priority_administration_component_1.PriorityAdministrationComponent,
- parameters_administration_component_1.ParametersAdministrationComponent,
- parameter_administration_component_1.ParameterAdministrationComponent,
profile_component_1.ProfileComponent,
signature_book_component_1.SignatureBookComponent,
signature_book_component_1.SafeUrlPipe
diff --git a/apps/maarch_entreprise/js/angular/app/app.module.ts b/apps/maarch_entreprise/js/angular/app/app.module.ts
index f5bf9fc4b2ef474c55a0faf5312ca0e67b3ed15f..9ac9757bf898b78d4380ede5f388a45fd208d8fb 100644
--- a/apps/maarch_entreprise/js/angular/app/app.module.ts
+++ b/apps/maarch_entreprise/js/angular/app/app.module.ts
@@ -1,69 +1,25 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
-import { RouterModule } from '@angular/router';
import { FormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';
import { AppComponent } from './app.component';
-import { AdministrationComponent } from './administration.component';
-import { UsersAdministrationComponent } from './users-administration.component';
-import { UserAdministrationComponent } from './user-administration.component';
-import { StatusListAdministrationComponent } from './status-list-administration.component';
-import { StatusAdministrationComponent } from './status-administration.component';
-import { ActionsAdministrationComponent } from './actions-administration.component';
-import { ActionAdministrationComponent } from './action-administration.component';
-import { ParameterAdministrationComponent } from './parameter-administration.component';
-import { ParametersAdministrationComponent } from './parameters-administration.component';
-import { PrioritiesAdministrationComponent } from './priorities-administration.component';
-import { PriorityAdministrationComponent } from './priority-administration.component';
-import { ProfileComponent } from './profile.component';
+import { AppRoutingModule } from './app-routing.module';
+import { AdministrationModule } from './administration/administration.module';
+import { ProfileComponent } from './profile.component';
import { SignatureBookComponent, SafeUrlPipe } from './signature-book.component';
-import { ReportsComponent } from './reports.component';
@NgModule({
imports: [
BrowserModule,
- //DataTablesModule,
FormsModule,
- RouterModule.forRoot([
- { path: 'administration', component: AdministrationComponent },
- { path: 'administration/users', component: UsersAdministrationComponent },
- { path: 'administration/users/new', component: UserAdministrationComponent },
- { path: 'administration/users/:id', component: UserAdministrationComponent },
- { path: 'administration/status', component: StatusListAdministrationComponent },
- { path: 'administration/status/new', component: StatusAdministrationComponent },
- { path: 'administration/status/:identifier', component: StatusAdministrationComponent },
- { path: 'profile', component: ProfileComponent },
- { path: 'administration/parameters', component: ParametersAdministrationComponent },
- { path: 'administration/parameters/new', component: ParameterAdministrationComponent },
- { path: 'administration/parameters/:id', component: ParameterAdministrationComponent },
- { path: 'administration/reports', component : ReportsComponent},
- { path: 'administration/priorities', component : PrioritiesAdministrationComponent },
- { path: 'administration/priorities/new', component : PriorityAdministrationComponent },
- { path: 'administration/priorities/:id', component : PriorityAdministrationComponent },
- { path: ':basketId/signatureBook/:resId', component: SignatureBookComponent },
- { path: 'administration/actions', component: ActionsAdministrationComponent },
- { path: 'administration/actions/new', component: ActionAdministrationComponent },
- { path: 'administration/actions/:id', component: ActionAdministrationComponent },
- { path: '**', redirectTo: '', pathMatch: 'full' },
- ], { useHash: true }),
- HttpClientModule
+ //HttpClientModule,
+ AdministrationModule,
+ AppRoutingModule
],
declarations: [
AppComponent,
- ActionAdministrationComponent,
- ActionsAdministrationComponent,
- AdministrationComponent,
- ReportsComponent,
- UsersAdministrationComponent,
- UserAdministrationComponent,
- StatusAdministrationComponent,
- StatusListAdministrationComponent,
- PrioritiesAdministrationComponent,
- PriorityAdministrationComponent,
- ParametersAdministrationComponent,
- ParameterAdministrationComponent,
ProfileComponent,
SignatureBookComponent,
SafeUrlPipe