From cedb3729018e3ce625d406bafb221f4b3138a425 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 1 Mar 2018 18:13:22 +0100
Subject: [PATCH] [REFACTORING] remove visamodel
---
modules/visa/Controllers/VisaController.php | 7 ++++-
modules/visa/Models/VisaModel.php | 15 ----------
modules/visa/Models/VisaModelAbstract.php | 32 ---------------------
phpunit.xml | 1 -
4 files changed, 6 insertions(+), 49 deletions(-)
delete mode 100755 modules/visa/Models/VisaModel.php
delete mode 100755 modules/visa/Models/VisaModelAbstract.php
diff --git a/modules/visa/Controllers/VisaController.php b/modules/visa/Controllers/VisaController.php
index d2aed0ffc7c..77f2851a008 100755
--- a/modules/visa/Controllers/VisaController.php
+++ b/modules/visa/Controllers/VisaController.php
@@ -71,6 +71,11 @@ class VisaController
'id' => ActionModel::getDefaultActionByGroupBasketId(['groupId' => $aArgs['groupId'], 'basketId' => $aArgs['basketId']]),
'actionLabel' => $actionLabel
];
+ $listInstances = ListInstanceModel::get([
+ 'select' => ['COUNT(*)'],
+ 'where' => ['res_id = ?', 'item_mode in (?)'],
+ 'data' => [$aArgs['resId'], ['visa', 'sign']]
+ ]);
$user = UserModel::getByUserId(['userId' => $GLOBALS['userId'], 'select' => ['id']]);
@@ -84,7 +89,7 @@ class VisaController
$datas['nbLinks'] = count(LinkModel::getByResId(['resId' => $resId]));
$datas['signatures'] = UserModel::getSignaturesById(['id' => $user['id']]);
$datas['consigne'] = UserModel::getCurrentConsigneById(['resId' => $resId]);
- $datas['hasWorkflow'] = VisaModel::hasVisaWorkflowByResId(['resId' => $resId]);
+ $datas['hasWorkflow'] = ((int)$listInstances[0]['count'] > 0);
$datas['listinstance'] = ListInstanceModel::getCurrentStepByResId(['resId' => $resId]);
$datas['canSign'] = ServiceModel::hasService(['id' => 'sign_document', 'userId' => $GLOBALS['userId'], 'location' => 'visa', 'type' => 'use']);
$datas['lang'] = LangModel::getSignatureBookLang();
diff --git a/modules/visa/Models/VisaModel.php b/modules/visa/Models/VisaModel.php
deleted file mode 100755
index 112496b0481..00000000000
--- a/modules/visa/Models/VisaModel.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Copyright Maarch since 2008 under licence GPLv3.
- * See LICENCE.txt file at the root folder for more details.
- * This file is part of Maarch software.
- *
- */
-
-namespace Visa\Models;
-
-class VisaModel extends VisaModelAbstract
-{
- // Do your stuff in this class
-}
\ No newline at end of file
diff --git a/modules/visa/Models/VisaModelAbstract.php b/modules/visa/Models/VisaModelAbstract.php
deleted file mode 100755
index 330413e117f..00000000000
--- a/modules/visa/Models/VisaModelAbstract.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Copyright Maarch since 2008 under licence GPLv3.
- * See LICENCE.txt file at the root folder for more details.
- * This file is part of Maarch software.
- *
- */
-
-namespace Visa\Models;
-
-use SrcCore\models\DatabaseModel;
-use SrcCore\models\ValidatorModel;
-
-class VisaModelAbstract
-{
-
- public static function hasVisaWorkflowByResId(array $aArgs = [])
- {
- ValidatorModel::notEmpty($aArgs, ['resId']);
- ValidatorModel::intVal($aArgs, ['resId']);
-
- $aReturn = DatabaseModel::select([
- 'select' => ['COUNT(*)'],
- 'table' => ['listinstance'],
- 'where' => ['res_id = ?', 'item_mode in (?)'],
- 'data' => [$aArgs['resId'], ['visa', 'sign']]
- ]);
-
- return ((int)$aReturn[0]['count'] > 0);
- }
-}
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
index 8df87220d6d..a3540525d8e 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -28,7 +28,6 @@
<directory suffix="Test.php">core/Test</directory>
<directory suffix=".php">src</directory>
<directory suffix=".php">modules/visa/Controllers</directory>
- <directory suffix=".php">modules/visa/Models</directory>
<directory suffix=".php">modules/convert/Controllers</directory>
<directory suffix=".php">modules/convert/Models</directory>
</whitelist>
--
GitLab