formatting fixes, bug fixes and support impl.

This commit is contained in:
Dennis Eichhorn 2021-07-04 18:27:20 +02:00
parent 4838f51422
commit f1a90be86d
28 changed files with 7 additions and 5 deletions

0
.directory Normal file → Executable file
View File

0
Admin/Install/Navigation.install.json Normal file → Executable file
View File

0
Admin/Install/Navigation.php Normal file → Executable file
View File

0
Admin/Install/db.json Normal file → Executable file
View File

0
Admin/Installer.php Normal file → Executable file
View File

0
Admin/Routes/Web/Backend.php Normal file → Executable file
View File

0
Admin/Status.php Normal file → Executable file
View File

0
Admin/Uninstaller.php Normal file → Executable file
View File

0
Admin/Updater.php Normal file → Executable file
View File

2
Controller/ApiController.php Normal file → Executable file
View File

@ -141,7 +141,7 @@ final class ApiController extends Controller
}
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
$request->getData('name') ?? '',
[$request->getData('name') ?? ''],
$uploadedFiles,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Modules/ContractManagement/Contracts/' . ($request->getData('contract_title') ?? '0'),

0
Controller/BackendController.php Normal file → Executable file
View File

2
Controller/Controller.php Normal file → Executable file
View File

@ -17,7 +17,7 @@ namespace Modules\ContractManagement\Controller;
use phpOMS\Module\ModuleAbstract;
/**
* Task class.
* Contract controller class.
*
* @package Modules\ContractManagement
* @license OMS License 1.0

0
Models/Contract.php Normal file → Executable file
View File

0
Models/ContractMapper.php Normal file → Executable file
View File

2
Models/ContractType.php Normal file → Executable file
View File

@ -90,7 +90,7 @@ class ContractType implements \JsonSerializable, ArrayableInterface
{
if ($l11n instanceof ContractTypeL11n) {
$this->l11n = $l11n;
} elseif ($this->l11n instanceof ContractTypeL11n) {
} elseif (isset($this->l11n) && $this->l11n instanceof ContractTypeL11n) {
$this->l11n->title = $l11n;
} else {
$this->l11n = new ContractTypeL11n();

0
Models/ContractTypeL11n.php Normal file → Executable file
View File

0
Models/ContractTypeL11nMapper.php Normal file → Executable file
View File

0
Models/ContractTypeMapper.php Normal file → Executable file
View File

0
Models/NullContract.php Normal file → Executable file
View File

0
Models/NullContractType.php Normal file → Executable file
View File

0
Models/NullContractTypeL11n.php Normal file → Executable file
View File

0
Models/PermissionState.php Normal file → Executable file
View File

0
README.md Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.en.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/en.lang.php Normal file → Executable file
View File

6
Theme/Backend/contract-list.tpl.php Normal file → Executable file
View File

@ -76,11 +76,13 @@ echo $this->getData('nav')->render(); ?>
$url = UriFactory::build('{/prefix}contract/single?{?}&id=' . $value->getId());
$type = 'ok';
if ($value->end->getTimestamp() < $now->getTimestamp() && $value->end->getTimestamp() + 129600 > $now->getTimestamp()) {
if (($value->end->getTimestamp() < $now->getTimestamp() && $value->end->getTimestamp() + 7776000 > $now->getTimestamp())
|| ($value->end->getTimestamp() > $now->getTimestamp() && $value->end->getTimestamp() - 7776000 < $now->getTimestamp())
) {
$type = 'error';
} elseif ($value->end->getTimestamp() < $now->getTimestamp()) {
$type = 'info';
} elseif ($value->end->getTimestamp() + 129600 < $now->getTimestamp()) {
} elseif ($value->end->getTimestamp() + 7776000 < $now->getTimestamp()) {
$type = 'warning';
}
?>

0
Theme/Backend/contract-single.tpl.php Normal file → Executable file
View File

0
info.json Normal file → Executable file
View File