fernando/luos
1
0
Fork 0
Code Releases Activity

Fix code style CASESCHEDULER, FILESMANAGER, PROJECTUSER, ASSIGNEE, PMUSER

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-02-14 09:39:24 -04:00
parent 96e51f5e5b
commit e6a93a902a
7 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/src/BusinessModel/FilesManager.php
View File

@@ -82,8 +82,7 @@ class FilesManager
}
foreach ($aFiles as $aFile) {
$extention = end(explode(".", $aFile['FILE']));
if ($extention == 'docx' || $extention == 'doc' || $extention == 'html' || $extention == 'php' || $extention == 'jsp' ||
$extention == 'xlsx' || $extention == 'xls' || $extention == 'js' || $extention == 'css' || $extention == 'txt') {
if ($extention == 'docx' || $extention == 'doc' || $extention == 'html' || $extention == 'php' || $extention == 'jsp' || $extention == 'xlsx' || $extention == 'xls' || $extention == 'js' || $extention == 'css' || $extention == 'txt') {
$sEditable = true;
} else {
$sEditable = false;

3
workflow/engine/src/BusinessModel/ProjectUser.php
View File

@@ -81,7 +81,8 @@ class ProjectUser
$exclude = array("");
for ($i = 0; $i<=count($aUsers)-1; $i++) {
if (!in_array(trim($aUsers[$i]["usr_uid"]) ,$exclude)) {
$aUsersGroups[] = $aUsers[$i]; $exclude[] = trim($aUsers[$i]["usr_uid"]);
$aUsersGroups[] = $aUsers[$i];
$exclude[] = trim($aUsers[$i]["usr_uid"]);
}
}
return $aUsersGroups;

6
workflow/engine/src/BusinessModel/Task.php
View File

@@ -1808,7 +1808,8 @@ class Task
*
* @return string
*/
public function validateProUid ($pro_uid) {
public function validateProUid ($pro_uid)
{
$pro_uid = trim($pro_uid);
if ($pro_uid == '') {
throw (new \Exception("The project with prj_uid: '', does not exist."));
@@ -1829,7 +1830,8 @@ class Task
*
* @return string
*/
public function validateActUid($act_uid) {
public function validateActUid($act_uid)
{
$act_uid = trim($act_uid);
if ($act_uid == '') {
throw (new \Exception("The activity with act_uid: '', does not exist."));

1
workflow/engine/src/BusinessModel/User.php
View File

@@ -489,7 +489,6 @@ class User
}
}
if ($form['USR_DUE_DATE'] != '') {
// throw new \Exception('`usr_due_date`. '.\G::LoadTranslation('ID_MSG_ERROR_DUE_DATE'));
$dueDate = explode("-", $form['USR_DUE_DATE']);
if (ctype_digit($dueDate[0])) {
if (checkdate($dueDate[1], $dueDate[2], $dueDate[0]) == false) {

10
workflow/engine/src/Services/Api/ProcessMaker/Project/FilesManager.php
View File

@@ -61,11 +61,13 @@ class FilesManager extends Api
/**
* @param string $prjUid {@min 32} {@max 32}
*
* @header Accept: application/octet-stream
* @url POST /:prjUid/process-file-manager/upload
*/
public function doPostProcessFilesManagerUpload($prjUid)
{
try {
//echo $request_data; die();
$userUid = $this->getUserId();
$filesManager = new \BusinessModel\FilesManager();
$arrayData = $filesManager->uploadProcessFilesManager($prjUid, $userUid);
@@ -168,3 +170,11 @@ class ProcessFilesManagerStructurePut
public $content;
}
class ProcessFilesManagerStructureUpload
{
/**
* @var string {@from body}
*/
public $url;
}

6
workflow/engine/src/Services/Api/ProcessMaker/User.php
View File

@@ -48,7 +48,8 @@ class User extends Api
*
* @status 201
*/
public function doPostUser($request_data) {
public function doPostUser($request_data)
{
try {
$user = new \BusinessModel\User();
$arrayData = $user->create($request_data);
@@ -66,7 +67,8 @@ class User extends Api
* @param string $usr_uid {@min 32}{@max 32}
* @param array $request_data
*/
public function doPutUser($usr_uid, $request_data) {
public function doPutUser($usr_uid, $request_data)
{
try {
$userLoggedUid = $this->getUserId();
$user = new \BusinessModel\User();