diff --git a/Rakefile b/Rakefile
index 5a16724d1..18c9b6432 100644
--- a/Rakefile
+++ b/Rakefile
@@ -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
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 235dd589c..b490bae8e 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -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"]);
diff --git a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html
index 4a7a6d18f..010e8e66b 100644
--- a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html
+++ b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html
@@ -6,330 +6,18 @@
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ ###TEMPLATES###
+
+
+
+
+
+
+
+ ###TEMPLATES###
+
+ 
Previous Step
+ Next step
+
+