diff --git a/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts
index 66fb1acdb17a0023da525f531b93146cdbbd5244..8ffdb8b7355618299be384cd92c44af483527a2b 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts
@@ -84,7 +84,7 @@ export class ActionsAdministrationComponent implements OnInit {
if (r) {
this.http.delete(this.coreUrl + 'rest/actions/' + action.id)
.subscribe((data: any) => {
- this.actions = data.action;
+ this.actions = data.actions;
this.dataSource = new MatTableDataSource(this.actions);
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
diff --git a/core/Test/ActionControllerTest.php b/core/Test/ActionControllerTest.php
index 4393207e3b7f7afbe3f5f11cfd6a1de73e2a0658..52ec933ebf86c5d33201a2f5c490224e3f24bd17 100755
--- a/core/Test/ActionControllerTest.php
+++ b/core/Test/ActionControllerTest.php
@@ -38,20 +38,9 @@ class ActionsControllerTest extends TestCase
$response = $actionController->create($fullRequest, new \Slim\Http\Response());
$responseBody = json_decode((string)$response->getBody());
- self::$id = $responseBody->action->id;
+ self::$id = $responseBody->actionId;
$this->assertInternalType('int', self::$id);
- $this->assertSame('indexing', $responseBody->action->keyword);
- $this->assertSame('TEST-LABEL', $responseBody->action->label_action);
- $this->assertSame('_NOSTATUS_', $responseBody->action->id_status);
- $this->assertSame('N', $responseBody->action->is_system);
- $this->assertSame('N', $responseBody->action->is_folder_action);
- $this->assertSame('Y', $responseBody->action->enabled);
- $this->assertSame('index_mlb', $responseBody->action->action_page);
- $this->assertSame('Y', $responseBody->action->history);
- $this->assertSame('apps', $responseBody->action->origin);
- $this->assertSame('N', $responseBody->action->create_id);
-
// FAIL CREATE
$aArgs = [
@@ -136,17 +125,7 @@ class ActionsControllerTest extends TestCase
$response = $actionController->update($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
$responseBody = json_decode((string)$response->getBody());
- $this->assertSame(self::$id, $responseBody->action->id);
- $this->assertSame('', $responseBody->action->keyword);
- $this->assertSame('TEST-LABEL_UPDATED', $responseBody->action->label_action);
- $this->assertSame('COU', $responseBody->action->id_status);
- $this->assertSame('N', $responseBody->action->is_system);
- $this->assertSame('Y', $responseBody->action->is_folder_action);
- $this->assertSame('Y', $responseBody->action->enabled);
- $this->assertSame('process', $responseBody->action->action_page);
- $this->assertSame('N', $responseBody->action->history);
- $this->assertSame('apps', $responseBody->action->origin);
- $this->assertSame('N', $responseBody->action->create_id);
+ $this->assertSame('success', $responseBody->success);
// UPDATE FAIL
$aArgs = [
@@ -177,7 +156,7 @@ class ActionsControllerTest extends TestCase
$response = $actionController->delete($request, new \Slim\Http\Response(), ['id' => self::$id]);
$responseBody = json_decode((string)$response->getBody());
- $this->assertNotNull($responseBody->action);
+ $this->assertNotNull($responseBody->actions);
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
@@ -185,7 +164,7 @@ class ActionsControllerTest extends TestCase
$response = $actionController->getById($request, new \Slim\Http\Response(), ['id' => self::$id]);
$responseBody = json_decode((string)$response->getBody());
- $this->assertNull($responseBody->action[0]);
+ $this->assertNull($responseBody->actions[0]);
// FAIL DELETE
$actionController = new \Action\controllers\ActionController();
diff --git a/rest/index.php b/rest/index.php
index 5b98219541b18e8fd7c2499b768c48a26e64086e..198d8970d83763f9902568c715cefe8289741ff5 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -110,6 +110,14 @@ $app = new \Slim\App(['settings' => ['displayErrorDetails' => true]]);
//Initialize
$app->get('/initialize', \SrcCore\controllers\CoreController::class . ':initialize');
+//Actions
+$app->get('/actions', \Action\controllers\ActionController::class . ':get');
+$app->get('/initAction', \Action\controllers\ActionController::class . ':initAction');
+$app->get('/actions/{id}', \Action\controllers\ActionController::class . ':getById');
+$app->post('/actions', \Action\controllers\ActionController::class . ':create');
+$app->put('/actions/{id}', \Action\controllers\ActionController::class . ':update');
+$app->delete('/actions/{id}', \Action\controllers\ActionController::class . ':delete');
+
//Administration
$app->get('/administration', \SrcCore\controllers\CoreController::class . ':getAdministration');
@@ -227,6 +235,7 @@ $app->put('/listTemplates/{id}', \Entity\controllers\ListTemplateController::cla
$app->delete('/listTemplates/{id}', \Entity\controllers\ListTemplateController::class . ':delete');
$app->get('/listTemplates/entityDest/itemId/{itemId}', \Entity\controllers\ListTemplateController::class . ':getByUserWithEntityDest');
$app->put('/listTemplates/entityDest/itemId/{itemId}', \Entity\controllers\ListTemplateController::class . ':updateByUserWithEntityDest');
+$app->put('/listTemplates/types/roles', \Entity\controllers\ListTemplateController::class . ':updateTypes');
//Parameters
$app->get('/parameters', \Parameter\controllers\ParameterController::class . ':get');
@@ -249,14 +258,6 @@ $app->get('/histories/users/{userSerialId}', \History\controllers\HistoryControl
//HistoryBatch
$app->get('/administration/historyBatch/eventDate/{date}', \History\controllers\HistoryBatchController::class . ':get');//TODO No date
-//actions
-$app->get('/actions', \Action\controllers\ActionController::class . ':get');
-$app->get('/initAction', \Action\controllers\ActionController::class . ':initAction');
-$app->get('/actions/{id}', \Action\controllers\ActionController::class . ':getById');
-$app->post('/actions', \Action\controllers\ActionController::class . ':create');
-$app->put('/actions/{id}', \Action\controllers\ActionController::class . ':update');
-$app->delete('/actions/{id}', \Action\controllers\ActionController::class . ':delete');
-
//Notifications
$app->get('/notifications', \Notification\controllers\NotificationController::class . ':get');
$app->post('/notifications', \Notification\controllers\NotificationController::class . ':create');
diff --git a/src/app/action/controllers/ActionController.php b/src/app/action/controllers/ActionController.php
index 5f2785a6e435f7adee154b6ef4457cea80e10437..8fcab4b520a91a52938529559496c633e46686f7 100644
--- a/src/app/action/controllers/ActionController.php
+++ b/src/app/action/controllers/ActionController.php
@@ -34,59 +34,37 @@ class ActionController
public function getById(Request $request, Response $response, $aArgs)
{
if (!Validator::intVal()->validate($aArgs['id'])) {
- return $response
- ->withStatus(500)
- ->withJson(['errors' => 'Id is not a numeric']);
+ return $response->withStatus(500)->withJson(['errors' => 'Id is not a numeric']);
}
- $obj['action'] = ActionModel::getById(['id' => $aArgs['id']]);
-
- if(!empty($obj['action'])){
- if ($obj['action']['is_folder_action'] == 'Y') {
- $obj['action']['is_folder_action'] = true;
- } else {
- $obj['action']['is_folder_action'] = false;
- }
-
- if ($obj['action']['history'] == 'Y') {
- $obj['action']['history'] = true;
- } else {
- $obj['action']['history'] = false;
- }
- if ($obj['action']['is_system'] == 'Y') {
- $obj['action']['is_system'] = true;
- } else {
- $obj['action']['is_system'] = false;
- }
+ $obj['action'] = ActionModel::getById(['id' => $aArgs['id']]);
- if ($obj['action']['create_id'] == 'Y') {
- $obj['action']['create_id'] = true;
- } else {
- $obj['action']['create_id'] = false;
- }
+ if (!empty($obj['action'])) {
+ $obj['action']['is_folder_action'] = ($obj['action']['is_folder_action'] == 'Y');
+ $obj['action']['history'] = ($obj['action']['history'] == 'Y');
+ $obj['action']['is_system'] = ($obj['action']['is_system'] == 'Y');
+ $obj['action']['create_id'] = ($obj['action']['create_id'] == 'Y');
- //array of id categoriesList
+ $actionCategories = [];
foreach ($obj['action']['actionCategories'] as $key => $category) {
- $arrActionCategories[] = $category['category_id'];
+ $actionCategories[] = $category['category_id'];
}
- $obj['action']['actionCategories'] = $arrActionCategories;
+ $obj['action']['actionCategories'] = $actionCategories;
$obj['categoriesList'] = CoreConfigModel::getLettersBoxCategories();
-
- //array of id categoriesList
- foreach ($obj['categoriesList'] as $key => $category) {
- $arrCategoriesList[] = $category['id'];
- }
-
- //array of id actionCategories
if (empty($obj['action']['actionCategories'])) {
- $obj['action']['actionCategories'] = $arrCategoriesList;
+ $categoriesList = [];
+ foreach ($obj['categoriesList'] as $key => $category) {
+ $categoriesList[] = $category['id'];
+ }
+ $obj['action']['actionCategories'] = $categoriesList;
}
-
+
+
$obj['statuses'] = StatusModel::get();
- array_unshift($obj['statuses'], ['id'=>'_NOSTATUS_','label_status'=> _UNCHANGED]);
+ array_unshift($obj['statuses'], ['id'=>'_NOSTATUS_', 'label_status'=> _UNCHANGED]);
$obj['action_pagesList'] = ActionModel::getAction_pages();
- array_unshift($obj['action_pagesList']['actionsPageList'], ['id'=>'','label'=> _NO_PAGE, 'name'=>'', 'origin'=>'']);
+ array_unshift($obj['action_pagesList']['actionsPageList'], ['id' => '', 'label' => _NO_PAGE, 'name' => '', 'origin' => '']);
$obj['keywordsList'] = ActionModel::getKeywords();
}
@@ -100,86 +78,63 @@ class ActionController
}
$data = $request->getParams();
- $data = $this->manageValue($data);
+ $data = $this->manageValue($data);
$errors = $this->control($data, 'create');
if (!empty($errors)) {
return $response->withStatus(500)->withJson(['errors' => $errors]);
}
- ActionModel::create($data);
-
- $obj = max(ActionModel::get());
+ $id = ActionModel::create($data);
HistoryController::add([
'tableName' => 'actions',
- 'recordId' => $obj['id'],
+ 'recordId' => $id,
'eventType' => 'ADD',
'eventId' => 'actionadd',
- 'info' => _ACTION_ADDED . ' : ' . $obj['label_action']
+ 'info' => _ACTION_ADDED . ' : ' . $data['label_action']
]);
- return $response->withJson(
- [
- 'action' => $obj
- ]
- );
+ return $response->withJson(['actionId' => $id]);
}
- public function update(Request $request, Response $response, $aArgs)
+ public function update(Request $request, Response $response, array $aArgs)
{
if (!ServiceModel::hasService(['id' => 'admin_actions', 'userId' => $GLOBALS['userId'], 'location' => 'apps', 'type' => 'admin'])) {
return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
}
- $obj = $request->getParams();
- $obj['id'] = $aArgs['id'];
+ $data = $request->getParams();
+ $data['id'] = $aArgs['id'];
- $obj = $this->manageValue($obj);
- $errors = $this->control($obj, 'update');
+ $data = $this->manageValue($data);
+ $errors = $this->control($data, 'update');
if (!empty($errors)) {
- return $response
- ->withStatus(500)
- ->withJson(['errors' => $errors]);
+ return $response->withStatus(500)->withJson(['errors' => $errors]);
}
- $return = ActionModel::update($obj);
-
- if ($return) {
- $id = $aArgs['id'];
- $obj = ActionModel::getById(['id' => $id]);
- } else {
- return $response
- ->withStatus(500)
- ->withJson(['errors' => 'Problem during action update']);
- }
+ ActionModel::update($data);
HistoryController::add([
'tableName' => 'actions',
- 'recordId' => $obj['id'],
+ 'recordId' => $aArgs['id'],
'eventType' => 'UP',
'eventId' => 'actionup',
- 'info' => _ACTION_UPDATED. ' : ' . $obj['label_action']
+ 'info' => _ACTION_UPDATED. ' : ' . $data['label_action']
]);
- return $response->withJson(
- [
- 'action' => $obj
- ]
- );
+ return $response->withJson(['success' => 'success']);
}
- public function delete(Request $request, Response $response, $aArgs)
+ public function delete(Request $request, Response $response, array $aArgs)
{
if (!ServiceModel::hasService(['id' => 'admin_actions', 'userId' => $GLOBALS['userId'], 'location' => 'apps', 'type' => 'admin'])) {
return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
}
if (!Validator::intVal()->validate($aArgs['id'])) {
- return $response
- ->withStatus(500)
- ->withJson(['errors' => 'Id is not a numeric']);
+ return $response->withStatus(500)->withJson(['errors' => 'Id is not a numeric']);
}
$action = ActionModel::getById(['id' => $aArgs['id']]);
@@ -193,7 +148,7 @@ class ActionController
'info' => _ACTION_DELETED. ' : ' . $action['label_action']
]);
- return $response->withJson(['action' => ActionModel::get()]);
+ return $response->withJson(['actions' => ActionModel::get()]);
}
protected function control($aArgs, $mode)
diff --git a/src/app/action/models/ActionModelAbstract.php b/src/app/action/models/ActionModelAbstract.php
index 179f22f4162d493e0576a5c52b35eb160f3e9d47..78c849eaba916d84476bad93eb7a4f5ae04ce79a 100644
--- a/src/app/action/models/ActionModelAbstract.php
+++ b/src/app/action/models/ActionModelAbstract.php
@@ -62,26 +62,28 @@ class ActionModelAbstract
public static function create(array $aArgs)
{
- $actioncategories = $aArgs['actionCategories'];
+ $actionCategories = empty($aArgs['actionCategories']) ? [] : $aArgs['actionCategories'];
unset($aArgs['actionCategories']);
+
+ $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'actions_id_seq']);
+ $aArgs['id'] = $nextSequenceId;
+
DatabaseModel::insert([
'table' => 'actions',
'columnsValues' => $aArgs
]);
- $tab['action_id'] = max(ActionModel::get())['id'];
-
- for ($i=0;$i<count($actioncategories);$i++) {
- $tab['category_id'] = $actioncategories[$i];
- DatabaseModel::insert(
- [
+ $data = [];
+ $data['action_id'] = $nextSequenceId;
+ foreach ($actionCategories as $actionCategory) {
+ $data['category_id'] = $actionCategory;
+ DatabaseModel::insert([
'table' => 'actions_categories',
- 'columnsValues' => $tab
- ]
- );
+ 'columnsValues' => $data
+ ]);
}
- return true;
+ return $nextSequenceId;
}
public static function update(array $aArgs)
diff --git a/src/app/entity/controllers/ListTemplateController.php b/src/app/entity/controllers/ListTemplateController.php
index 5cb9eeaec1bfd817aa9940200b76010606b821eb..0915f74d04ff4bd69845599e35ca5aeb476a9382 100644
--- a/src/app/entity/controllers/ListTemplateController.php
+++ b/src/app/entity/controllers/ListTemplateController.php
@@ -277,6 +277,40 @@ class ListTemplateController
return $response->withJson(['success' => 'success']);
}
+ public function updateTypes(Request $request, Response $response)
+ {
+ if (!ServiceModel::hasService(['id' => 'manage_entities', 'userId' => $GLOBALS['userId'], 'location' => 'entities', 'type' => 'admin'])) {
+ return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
+ }
+
+ $data = $request->getParams();
+
+ $check = Validator::stringType()->notEmpty()->validate($data['typeId']);
+ $check = $check && Validator::arrayType()->notEmpty()->validate($data['roles']);
+ if (!$check) {
+ return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
+ }
+
+
+ $roles = '';
+ foreach ($data['roles'] as $role) {
+ if ($role['available'] === true) {
+ if (!empty($roles)) {
+ $roles .= ' ';
+ }
+ $roles .= $role['id'];
+ }
+ }
+
+ ListTemplateModel::updateTypes([
+ 'set' => ['difflist_type_roles' => $roles],
+ 'where' => ['difflist_type_id = ?'],
+ 'data' => [$data['typeId']]
+ ]);
+
+ return $response->withJson(['success' => 'success']);
+ }
+
private static function checkItems(array $aArgs)
{
ValidatorModel::notEmpty($aArgs, ['items']);
diff --git a/src/app/entity/models/ListTemplateModelAbstract.php b/src/app/entity/models/ListTemplateModelAbstract.php
index 1f199dcdaa470e147f4a2e54cad53615ef20ec10..8595af155a70a97e2a7e856c24e4d79dae3856a2 100644
--- a/src/app/entity/models/ListTemplateModelAbstract.php
+++ b/src/app/entity/models/ListTemplateModelAbstract.php
@@ -128,4 +128,19 @@ class ListTemplateModelAbstract
return $aListTemplatesTypes;
}
+
+ public static function updateTypes(array $aArgs)
+ {
+ ValidatorModel::notEmpty($aArgs, ['set', 'where', 'data']);
+ ValidatorModel::arrayType($aArgs, ['set', 'where', 'data']);
+
+ DatabaseModel::update([
+ 'table' => 'difflist_types',
+ 'set' => $aArgs['set'],
+ 'where' => $aArgs['where'],
+ 'data' => $aArgs['data']
+ ]);
+
+ return true;
+ }
}