fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2

Browse Source
This commit is contained in:
Marco A. Nina Mena
2015-06-22 08:47:38 -04:00
parent 9d5c49c20b 221a2516ae
commit 9d250c7291
5 changed files with 212 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

251
gulliver/js/dveditor/core/dveditor.js
View File

@@ -1,129 +1,136 @@
function DVEditor(where,body,oHiddenInput,height,mode) function DVEditor(where,body,oHiddenInput,height,mode,editorId)
{ {
var me=this; var me=this;
var hiddenInput=oHiddenInput; var hiddenInput=oHiddenInput;
var iframe=$dce("iframe"); var iframe=$dce("iframe");
//NOTE: className no funciona en FIREFOX //NOTE: className no funciona en FIREFOX
iframe.style.width="100%"; iframe.style.width="100%";
iframe.style.height=height; iframe.style.height=height;
iframe.style.margin="0px"; iframe.style.margin="0px";
iframe.style.padding="0px"; iframe.style.padding="0px";
iframe.style.border="none"; iframe.style.border="none";
where.appendChild(iframe); where.appendChild(iframe);
var head=document.childNodes[0].childNodes[0]; var head=document.childNodes[0].childNodes[0];
var header=''; var header='';
if (iframe.contentWindow) if (iframe.contentWindow) {
{ var doc = iframe.contentWindow.document;
var doc=iframe.contentWindow.document; } else {
} var doc = iframe.contentDocument;
else
{
var doc=iframe.contentDocument;
}
var _header=$dce("head");// head.cloneNode(true);
for(var i=0;i<head.childNodes.length;i++) {
try{
if ((head.childNodes[i].tagName==='LINK')&&
(head.childNodes[i].type="text/css"))
{
_header.appendChild(head.childNodes[i].cloneNode(true));
}
else
{
}
} }
catch(e) var _header = $dce("head");// head.cloneNode(true);
for (var i=0;i<head.childNodes.length;i++) {
try {
if ((head.childNodes[i].tagName==='LINK')&&
(head.childNodes[i].type="text/css")) {
_header.appendChild(head.childNodes[i].cloneNode(true));
}
} catch (e) {
}
}
header=_header.innerHTML;
//alert(header);
doc.open();
doc.write('<html><head>'+header+'</head><body style="height:100%;padding:0px;margin:0px;border:none;background-color:ThreeDHighlight;cursor:text;">'+body+'</body></html>');
doc.close();
doc.designMode="on";
if (mode=="edit") {
doc.contentEditable=true;
} else {
doc.contentEditable=false;
}
this.doc=doc;
me.insertHTML = function (html)
{ {
} var cmd = 'inserthtml';
} var bool = false;
header=_header.innerHTML; var value = html;
//alert(header); try {
doc.open(); doc.execCommand(cmd,bool,value);
doc.write('<html><head>'+header+'</head><body style="height:100%;padding:0px;margin:0px;border:none;background-color:ThreeDHighlight;cursor:text;">'+body+'</body></html>'); } catch (e) {
doc.close(); }
doc.designMode="on"; return false;
if(mode=="edit"){ };
doc.contentEditable=true;
}else{ me.command = function()
doc.contentEditable=false;
}
this.doc=doc;
me.insertHTML=function (html)
{
var cmd = 'inserthtml';
var bool = false;
var value = html;
try
{ {
doc.execCommand(cmd,bool,value); var cmd = this.getAttribute('name');
} catch (e) { var bool = false;
} var value = this.getAttribute('cmdValue') || null;
return false; if (value == 'promptUser') {
}; value = prompt(
me.command=function() (typeof(G_STRINGS[this.getAttribute('promptText')])!=='undefined')?
{ G_STRINGS[this.getAttribute('promptText')]:
var cmd = this.getAttribute('name'); this.getAttribute('promptText')
var bool = false; );
var value = this.getAttribute('cmdValue') || null; }
if (value == 'promptUser') try {
value = prompt( if (editorId) {
(typeof(G_STRINGS[this.getAttribute('promptText')])!=='undefined')? if (window.ActiveXObject && cmd == 'hilitecolor') {
G_STRINGS[this.getAttribute('promptText')]: doc.selection.createRange().pasteHTML('<span style ="background-color:' + value + '">' +doc.selection.createRange().text +'</span>');
this.getAttribute('promptText') } else {
); eval("window._editor" +editorId+".doc.execCommand(cmd,bool,value);");
try }
} else {
doc.execCommand(cmd,bool,value);
}
} catch (e) {
}
return false;
};
me.loadToolBar = function(uri)
{ {
doc.execCommand(cmd,bool,value); var tb=WebResource(uri);
} catch (e) { if(editorId){ // for multi-edhtmleditor
} tb.innerHTML = tb.innerHTML.replace(/DVEditorMap/g, "DVEditorMap" + editorId);
return false; }
} iframe.parentNode.insertBefore(tb,iframe);
me.loadToolBar=function(uri) me.setToolBar(tb);
{ };
var tb=WebResource(uri);
iframe.parentNode.insertBefore(tb,iframe); me.setToolBar = function(toolbar)
me.setToolBar(tb);
}
me.setToolBar=function(toolbar)
{
var buttons=toolbar.getElementsByTagName('area');
for(var b=0;b<buttons.length;b++)
{ {
buttons[b].onclick=me.command; var buttons=toolbar.getElementsByTagName('area');
} for (var b=0;b<buttons.length;b++) {
} buttons[b].onclick=me.command;
me.getHTML=function() }
{ };
var body='';
try { me.getHTML = function()
body=doc.getElementsByTagName('body')[0]; {
body=body.innerHTML; var body='';
} catch (e) { try {
} body=doc.getElementsByTagName('body')[0];
return body; body=body.innerHTML;
} } catch (e) {
me.setHTML=function(html) }
{ return body;
try { };
body=doc.getElementsByTagName('body')[0]; me.setHTML = function(html)
body.innerHTML=html; {
} catch (e) { try {
} body=doc.getElementsByTagName('body')[0];
return body; body.innerHTML=html;
} } catch (e) {
me.refreshHidden=function() }
{ return body;
if(hiddenInput) };
{
var html=me.getHTML(); me.refreshHidden = function()
var raiseOnChange=hiddenInput.value!==html; {
hiddenInput.value=html; if(hiddenInput)
if (raiseOnChange && hiddenInput.onchange) hiddenInput.onchange(); {
} var html=me.getHTML();
} var raiseOnChange=hiddenInput.value!==html;
me.syncHidden=function(name) hiddenInput.value=html;
{ if (raiseOnChange && hiddenInput.onchange) hiddenInput.onchange();
me.refreshHidden(); }
setTimeout(name+".syncHidden('"+name+"')",500); };
}
me.syncHidden = function(name)
{
me.refreshHidden();
setTimeout(name+".syncHidden('"+name+"')",500);
};
} }

36
gulliver/system/class.xmlform.php
View File

@@ -4028,6 +4028,42 @@ class XmlForm_Field_CheckGroup extends XmlForm_Field
} }
} }
/**
* Renderring the checkgroup inner grid for Staff Eval Plugin
* @see class.form.php#validateArray();
* @author Edauto
* @since 2012-07-20
*/
public function renderGrid($values = NULL, $owner = NULL) {
$this->executeSQL ( $owner );
$disable = ($owner->mode === 'view') ? 'disabled="disabled" ' : ' ';
$r = 1;
$result = array();
foreach ( $values as $v ) { // foreach the grid row with selection
$i=1;
$html = '';
if (! is_array ( $v )) {
$aV = explode ( '|', str_replace(" ","",$v));
} else {
$aV = $v;
}
foreach ( $this->options as $optionName => $option ) { // foreach the options of checkbox group
$bChecked = in_array ( $i , $aV, true ) || in_array($optionName, $aV, true);
$html .= '<input id="form[' . $owner->name . ']['. $r .']['. $this->name .'][' . $optionName . ']" ';
$html .= 'name="form[' . $owner->name . ']['. $r .']['. $this->name .'][]" ';
$html .= 'type="checkbox" value="' . $optionName . '" ' . ($bChecked ? 'checked ' : ' ') ;
$html .= $disable . '><span class="FormCheck">' . $option . '</span></input>';
if(++$i==count($this->options)){
$html .= ' ' . $this->renderHint();
}
$html .= '<br />';
}
$result[] = $html;
$r++;
}
return $result;
}
} }
/* TODO: DEPRECATED */ /* TODO: DEPRECATED */

74
workflow/engine/classes/model/OutputDocument.php
View File

@@ -178,12 +178,12 @@ class OutputDocument extends BaseOutputDocument
if(!empty($aData['OUT_DOC_DESCRIPTION'])){ if(!empty($aData['OUT_DOC_DESCRIPTION'])){
$description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION']; $description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION'];
} }
if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){ if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){
$description .= ", Report Generator: ". $aData['OUT_DOC_REPORT_GENERATOR']; $description .= ", Report Generator: ". $aData['OUT_DOC_REPORT_GENERATOR'];
} }
if(!empty($aData['OUT_DOC_GENERATE'])){ if(!empty($aData['OUT_DOC_GENERATE'])){
$description .= ", Output Document to Generate: ".$aData['OUT_DOC_GENERATE']; $description .= ", Output Document to Generate: ".$aData['OUT_DOC_GENERATE'];
} }
if($aData['OUT_DOC_PDF_SECURITY_ENABLED']==0){ if($aData['OUT_DOC_PDF_SECURITY_ENABLED']==0){
$pdfSecurity = 'Disabled'; $pdfSecurity = 'Disabled';
}else{ }else{
@@ -199,14 +199,14 @@ class OutputDocument extends BaseOutputDocument
if(!empty($aData['OUT_DOC_TAGS'])){ if(!empty($aData['OUT_DOC_TAGS'])){
$description .= ", Tags: ".$aData['OUT_DOC_TAGS']; $description .= ", Tags: ".$aData['OUT_DOC_TAGS'];
} }
if(!empty($aData['OUT_DOC_OPEN_TYPE'])){ if(!empty($aData['OUT_DOC_OPEN_TYPE'])){
if($aData['OUT_DOC_OPEN_TYPE']==0){ if($aData['OUT_DOC_OPEN_TYPE']==0){
$genLink = 'Open the file'; $genLink = 'Open the file';
}else{ }else{
$genLink = 'Download the file'; $genLink = 'Download the file';
} }
$description .= ", By clicking on the generated file link: ".$genLink; $description .= ", By clicking on the generated file link: ".$genLink;
} }
G::auditLog("CreateOutputDocument", $description); G::auditLog("CreateOutputDocument", $description);
return $aData['OUT_DOC_UID']; return $aData['OUT_DOC_UID'];
@@ -268,12 +268,12 @@ class OutputDocument extends BaseOutputDocument
if(!empty($aData['OUT_DOC_DESCRIPTION'])){ if(!empty($aData['OUT_DOC_DESCRIPTION'])){
$description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION']; $description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION'];
} }
if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){ if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){
$description .= ", Report Generator: ". $aData['OUT_DOC_REPORT_GENERATOR']; $description .= ", Report Generator: ". $aData['OUT_DOC_REPORT_GENERATOR'];
} }
if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){ if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){
$description .= ", Output Document to Generate: ".$aData['OUT_DOC_GENERATE']; $description .= ", Output Document to Generate: ".$aData['OUT_DOC_GENERATE'];
} }
if($aData['OUT_DOC_PDF_SECURITY_ENABLED']==0){ if($aData['OUT_DOC_PDF_SECURITY_ENABLED']==0){
$pdfSecurity = 'Disabled'; $pdfSecurity = 'Disabled';
}else{ }else{
@@ -289,14 +289,14 @@ class OutputDocument extends BaseOutputDocument
if(!empty($aData['OUT_DOC_TAGS'])){ if(!empty($aData['OUT_DOC_TAGS'])){
$description .= ", Tags: ".$aData['OUT_DOC_TAGS']; $description .= ", Tags: ".$aData['OUT_DOC_TAGS'];
} }
if(!empty($aData['OUT_DOC_OPEN_TYPE'])){ if(!empty($aData['OUT_DOC_OPEN_TYPE'])){
if($aData['OUT_DOC_OPEN_TYPE']==0){ if($aData['OUT_DOC_OPEN_TYPE']==0){
$genLink = 'Open the file'; $genLink = 'Open the file';
}else{ }else{
$genLink = 'Download the file'; $genLink = 'Download the file';
} }
$description .= ", By clicking on the generated file link: ".$genLink; $description .= ", By clicking on the generated file link: ".$genLink;
} }
if (isset($aData['OUT_DOC_TEMPLATE'])) { if (isset($aData['OUT_DOC_TEMPLATE'])) {
$description .= ", [EDIT TEMPLATE]"; $description .= ", [EDIT TEMPLATE]";
} }
@@ -556,6 +556,24 @@ class OutputDocument extends BaseOutputDocument
if (($sUID != '') && is_array($aFields) && ($sPath != '')) { if (($sUID != '') && is_array($aFields) && ($sPath != '')) {
$sContent = G::replaceDataGridField($sContent, $aFields); $sContent = G::replaceDataGridField($sContent, $aFields);
if (strpos($sContent, '<!---{') !== false) {
$template = new Smarty();
$template->compile_dir = PATH_SMARTY_C;
$template->cache_dir = PATH_SMARTY_CACHE;
$template->config_dir = PATH_THIRDPARTY . 'smarty/configs';
$template->caching = false;
$template->left_delimiter = '<!---{';
$template->right_delimiter = '}--->';
$oFile = fopen($sPath . $sFilename . '_smarty.html', 'wb');
fwrite($oFile, $sContent);
fclose($oFile);
$template->templateFile = $sPath . $sFilename . '_smarty.html';
//assign the variables and use the template $template
$template->assign($aFields);
$sContent = $template->fetch($template->templateFile);
unlink($template->templateFile);
}
G::verifyPath($sPath, true); G::verifyPath($sPath, true);
//Start - Create .doc //Start - Create .doc

4
workflow/engine/menus/setup.php
View File

@@ -66,10 +66,6 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1) {
//$G_TMP_MENU->AddIdRawOption('REPORT_TABLES', '../reportTables/main', 'Report Tables', 'icon-tables.png','', 'settings'); //$G_TMP_MENU->AddIdRawOption('REPORT_TABLES', '../reportTables/main', 'Report Tables', 'icon-tables.png','', 'settings');
$G_TMP_MENU->AddIdRawOption('PM_TABLES', '../pmTables', G::LoadTranslation('ID_ADDITIONAL_TABLES'), 'icon-tables.png','', 'settings'); $G_TMP_MENU->AddIdRawOption('PM_TABLES', '../pmTables', G::LoadTranslation('ID_ADDITIONAL_TABLES'), 'icon-tables.png','', 'settings');
if (!$partnerFlag) {
$G_TMP_MENU->AddIdRawOption('WEBSERVICES', 'webServices', G::LoadTranslation('ID_WEB_SERVICES'), 'icon-webservices.png', '', 'settings');
}
$G_TMP_MENU->AddIdRawOption('LOGIN', 'loginSettings', G::LoadTranslation('LOGIN'), "",'', 'settings'); $G_TMP_MENU->AddIdRawOption('LOGIN', 'loginSettings', G::LoadTranslation('LOGIN'), "",'', 'settings');
$G_TMP_MENU->AddIdRawOption('DASHBOARD', '../dashboard/dashletsList', ucfirst(G::LoadTranslation('ID_DASHBOARD')), '', '', 'settings'); $G_TMP_MENU->AddIdRawOption('DASHBOARD', '../dashboard/dashletsList', ucfirst(G::LoadTranslation('ID_DASHBOARD')), '', '', 'settings');
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/

2
workflow/engine/templates/oauth2/clientSetup.js
View File

@@ -645,7 +645,7 @@ clientSetup.application = {
//style: "margin: 0 auto 0 auto;", //style: "margin: 0 auto 0 auto;",
//width: 550, //width: 550,
//height: 450, //height: 450,
title: "<div><div style=\"float: left;\">" + "ProcessMaker Dev Tools / User Applications" + "</div><div id=\"divAccessTokenSetup\" style=\"float: right;\"></div><div style=\"clear: both; height: 0; line-height:0; font-size: 0;\"></div></div>", title: "<div><div style=\"float: left;\">" + "User Applications" + "</div><div id=\"divAccessTokenSetup\" style=\"float: right;\"></div><div style=\"clear: both; height: 0; line-height:0; font-size: 0;\"></div></div>",
border: false, border: false,
listeners: { listeners: {