fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Victor Saisa Lopez
2014-07-22 09:07:18 -04:00
parent e64786addb e8403738f7
commit c607ad6893
5 changed files with 98 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Rakefile
View File

@@ -153,6 +153,38 @@ def buildPmdynaform(homeDir, targetDir, mode)
system("rm #{pmdynaformDir}/build/appBuild.js")
readyForm = ""
system("echo '#{readyForm}' >> #{pmdynaformDir}/build/appBuild.js ")
system("cp #{Dir.pwd}/workflow/engine/templates/cases/cases_Step_Pmdynaform.html #{pmdynaformDir}/build/cases_Step_Pmdynaform.html")
system("cp #{Dir.pwd}/workflow/engine/templates/cases/cases_Step_Pmdynaform_Preview.html #{pmdynaformDir}/build/cases_Step_Pmdynaform_Preview.html")
template = ""
config = File.read "#{homeDir}/config/templates.json"
json = JSON.parse config
json.each do |key|
s = ""
key["files"].each do |source|
s += File.read "#{homeDir}/#{source}"
s += "\n"
end
template += s
end
target = "#{pmdynaformDir}/build/cases_Step_Pmdynaform.html"
html = File.read target
while html['###TEMPLATES##'] do
html['###TEMPLATES###'] = template
end
File.open(target, 'w+') do |file|
file.write html
end
target = "#{pmdynaformDir}/build/cases_Step_Pmdynaform_Preview.html"
html = File.read target
while html['###TEMPLATES##'] do
html['###TEMPLATES###'] = template
end
File.open(target, 'w+') do |file|
file.write html
end
puts "\nPmDynaform Build Finished!".magenta
end

37
workflow/engine/js/cases/core/cases_Step_Pmdynaform.js
View File

@@ -36,4 +36,41 @@ window.onload = function () {
parent.setCurrent(dyn_uid);
}
}
// TYPE:ASSIGN_TASK
// UID:-1
// POSITION:10000
// ACTION:ASSIGN
var submit = document.getElementsByTagName("button");
$a = submit;
if (submit.length > 0) {
submit = submit[0];
var form = document.getElementsByTagName("form")[0];
$b = form;
var TYPE = document.createElement("input");
TYPE.type = "hidden";
TYPE.value = "ASSIGN_TASK";
TYPE.name = "TYPE";
var UID = document.createElement("input");
UID.type = "hidden";
UID.value = "-1";
UID.name = "UID";
var POSITION = document.createElement("input");
POSITION.type = "hidden";
POSITION.value = "10000";
POSITION.value = "POSITION";
var ACTION = document.createElement("input");
ACTION.type = "hidden";
ACTION.value = "ASSIGN";
ACTION.value = "ACTION";
form.appendChild(TYPE);
form.appendChild(UID);
form.appendChild(POSITION);
form.appendChild(ACTION);
}
};

3
workflow/engine/methods/cases/cases_Step.php
View File

@@ -270,7 +270,8 @@ try {
$ds->next();
$row = $ds->getRow();
if (isset($row) && $row["DYN_VERSION"] == 2) {
$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step_Pmdynaform.html');
//$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step_Pmdynaform.html');
$oTemplatePower = new TemplatePower(PATH_HOME . 'public_html/lib/pmdynaform/build/cases_Step_Pmdynaform.html');
$oTemplatePower->prepare();
$oTemplatePower->assign("JSON_DATA", $row["DYN_CONTENT"]);
$oTemplatePower->assign("CASE", $array["CASE"]);

317
workflow/engine/templates/cases/cases_Step_Pmdynaform.html
View File

File diff suppressed because it is too large Load Diff

25
workflow/engine/templates/cases/cases_Step_Pmdynaform_Preview.html Normal file
View File

@@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<title>PMDynaform</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel='stylesheet' type='text/css' href='/css/neoclassic-blank.css' />
<link rel="stylesheet" href="/lib/pmdynaform/libs/bootstrap-3.1.1/css/bootstrap.min.css">
<link rel="stylesheet" href="/lib/pmdynaform/build/css/PMDynaform.css">
<script type="text/javascript" src="/lib/pmdynaform/libs/jquery/jquery-1.11.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/jquery/jquery.inputmask.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/bootstrap-3.1.1/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/underscore/underscore-1.6.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/backbone/backbone-min.js"></script>
</head>
<body>
<div id="container"></div>
###TEMPLATES###
<script type="text/javascript" src="/lib/pmdynaform/build/js/PMDynaform.js"></script>
<a style="float: left; margin: 10px 2px 2px 10px; cursor: pointer; opacity: 1;"><img src="/lib/img/pager-previous-icon.png" style="padding-right:5px;width:25px;height:20px;">Previous Step</a>
<a style="float: right; margin: 10px 10px 2px 2px; cursor: pointer; opacity: 1;">Next step<img src="/lib/img/pager-next-icon.png" style="padding-left:5px;width:25px;height:20px;"></a>
</body>
</html>