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

PM-2681 "Case Tracker: En Internet Explorer..." SOLVED

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2015-05-14 15:35:23 -04:00
parent dfa6cbf31a
commit 5c23c27b6e
6 changed files with 173 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
workflow/engine/methods/tracker/tracker_DynaDocs.php
View File

@@ -66,5 +66,44 @@ if ($noShowTitle == 0) {
$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_DynaDocs', $oProcessMap->getCaseTrackerObjectsCriteria( $_SESSION['PROCESS'] ), array ('VIEW' => G::LoadTranslation( 'ID_VIEW' )
) );
G::RenderPage( 'publish' );
$bpmn = new ProcessMaker\Project\Bpmn();
$flagIsBpmn = ($bpmn->exists($_SESSION["PROCESS"]))? true : false;
if ($flagIsBpmn) {
$urlTrackerProcessMap = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APPLICATION"] . "&tracker_designer=1";
$_SESSION["TRACKER_JAVASCRIPT"] = "
<script type=\"text/javascript\">
var winTracker;
if ((navigator.userAgent.indexOf(\"MSIE\") != -1) || (navigator.userAgent.indexOf(\"Trident\") != -1)) {
var li1 = document.getElementById(\"MAP\");
var a1 = li1.getElementsByTagName(\"a\");
a1[0].onclick = function () {
winTracker = window.open(\"$urlTrackerProcessMap\", \"winTracker\");
li1.className = \"SelectedMenu\";
li2.className = \"mainMenu\";
li3.className = \"mainMenu\";
li4.className = \"mainMenu\";
document.getElementById(\"trackerContainer\").innerHTML = \"\";
return false;
};
var li2 = document.getElementById(\"DYNADOC\");
var a2= li2.getElementsByTagName(\"a\");
a2[0].onclick = function () { if (winTracker) { winTracker.close(); } };
var li3 = document.getElementById(\"HISTORY\");
var a3 = li3.getElementsByTagName(\"a\");
a3[0].onclick = function () { if (winTracker) { winTracker.close(); } };
var li4 = document.getElementById(\"MESSAGES\");
var a4 = li4.getElementsByTagName(\"a\");
a4[0].onclick = function () { if (winTracker) { winTracker.close(); } };
}
</script>
";
}
G::RenderPage("publish");

42
workflow/engine/methods/tracker/tracker_History.php
View File

@@ -62,5 +62,45 @@ if ($noShowTitle == 0) {
$G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $aFields );
}
$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_TransferHistory', Cases::getTransferHistoryCriteria( $_SESSION['APPLICATION'] ), array () );
G::RenderPage( 'publish' );
$bpmn = new ProcessMaker\Project\Bpmn();
$flagIsBpmn = ($bpmn->exists($_SESSION["PROCESS"]))? true : false;
if ($flagIsBpmn) {
$urlTrackerProcessMap = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APPLICATION"] . "&tracker_designer=1";
$_SESSION["TRACKER_JAVASCRIPT"] = "
<script type=\"text/javascript\">
var winTracker;
if ((navigator.userAgent.indexOf(\"MSIE\") != -1) || (navigator.userAgent.indexOf(\"Trident\") != -1)) {
var li1 = document.getElementById(\"MAP\");
var a1 = li1.getElementsByTagName(\"a\");
a1[0].onclick = function () {
winTracker = window.open(\"$urlTrackerProcessMap\", \"winTracker\");
li1.className = \"SelectedMenu\";
li2.className = \"mainMenu\";
li3.className = \"mainMenu\";
li4.className = \"mainMenu\";
document.getElementById(\"trackerContainer\").innerHTML = \"\";
return false;
};
var li2 = document.getElementById(\"DYNADOC\");
var a2= li2.getElementsByTagName(\"a\");
a2[0].onclick = function () { if (winTracker) { winTracker.close(); } };
var li3 = document.getElementById(\"HISTORY\");
var a3 = li3.getElementsByTagName(\"a\");
a3[0].onclick = function () { if (winTracker) { winTracker.close(); } };
var li4 = document.getElementById(\"MESSAGES\");
var a4 = li4.getElementsByTagName(\"a\");
a4[0].onclick = function () { if (winTracker) { winTracker.close(); } };
}
</script>
";
}
G::RenderPage("publish");

42
workflow/engine/methods/tracker/tracker_Messages.php
View File

@@ -64,5 +64,45 @@ if ($noShowTitle == 0) {
}
$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_Messages', Cases::getHistoryMessagesTracker( $_SESSION['APPLICATION'] ), array ('VIEW' => G::LoadTranslation( 'ID_VIEW' )
) );
G::RenderPage( 'publish' );
$bpmn = new ProcessMaker\Project\Bpmn();
$flagIsBpmn = ($bpmn->exists($_SESSION["PROCESS"]))? true : false;
if ($flagIsBpmn) {
$urlTrackerProcessMap = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APPLICATION"] . "&tracker_designer=1";
$_SESSION["TRACKER_JAVASCRIPT"] = "
<script type=\"text/javascript\">
var winTracker;
if ((navigator.userAgent.indexOf(\"MSIE\") != -1) || (navigator.userAgent.indexOf(\"Trident\") != -1)) {
var li1 = document.getElementById(\"MAP\");
var a1 = li1.getElementsByTagName(\"a\");
a1[0].onclick = function () {
winTracker = window.open(\"$urlTrackerProcessMap\", \"winTracker\");
li1.className = \"SelectedMenu\";
li2.className = \"mainMenu\";
li3.className = \"mainMenu\";
li4.className = \"mainMenu\";
document.getElementById(\"trackerContainer\").innerHTML = \"\";
return false;
};
var li2 = document.getElementById(\"DYNADOC\");
var a2= li2.getElementsByTagName(\"a\");
a2[0].onclick = function () { if (winTracker) { winTracker.close(); } };
var li3 = document.getElementById(\"HISTORY\");
var a3 = li3.getElementsByTagName(\"a\");
a3[0].onclick = function () { if (winTracker) { winTracker.close(); } };
var li4 = document.getElementById(\"MESSAGES\");
var a4 = li4.getElementsByTagName(\"a\");
a4[0].onclick = function () { if (winTracker) { winTracker.close(); } };
}
</script>
";
}
G::RenderPage("publish");

46
workflow/engine/methods/tracker/tracker_ViewMap.php
View File

@@ -59,7 +59,7 @@ while ($ds->next()) {
$row = $ds->getRow();
$bpmnProjects[] = $row['PRJ_UID'];
}
switch (($aCaseTracker['CT_MAP_TYPE'])) {
case 'NONE':
//Nothing
@@ -71,11 +71,48 @@ switch (($aCaseTracker['CT_MAP_TYPE'])) {
$aFields = $oCase->loadCase( $_SESSION['APPLICATION'] );
if (in_array($aFields['PRO_UID'], $bpmnProjects)) {
//bpmb
$_SESSION["APP_UID"] = $aFields["APP_UID"];
$_SESSION["APPLICATION"] = $aFields["APP_UID"];
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'view', 'tracker/viewMap' );
G::RenderPage( 'publish' );
$urlTrackerProcessMap = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APPLICATION"] . "&tracker_designer=1";
$_SESSION["TRACKER_JAVASCRIPT"] = "
<script type=\"text/javascript\">
var winTracker;
if ((navigator.userAgent.indexOf(\"MSIE\") != -1) || (navigator.userAgent.indexOf(\"Trident\") != -1)) {
var li1 = document.getElementById(\"MAP\");
var a1 = li1.getElementsByTagName(\"a\");
a1[0].onclick = function () {
winTracker = window.open(\"$urlTrackerProcessMap\", \"winTracker\");
li1.className = \"SelectedMenu\";
li2.className = \"mainMenu\";
li3.className = \"mainMenu\";
li4.className = \"mainMenu\";
document.getElementById(\"trackerContainer\").innerHTML = \"\";
return false;
};
var li2 = document.getElementById(\"DYNADOC\");
var a2= li2.getElementsByTagName(\"a\");
a2[0].onclick = function () { if (winTracker) { winTracker.close(); } };
var li3 = document.getElementById(\"HISTORY\");
var a3 = li3.getElementsByTagName(\"a\");
a3[0].onclick = function () { if (winTracker) { winTracker.close(); } };
var li4 = document.getElementById(\"MESSAGES\");
var a4 = li4.getElementsByTagName(\"a\");
a4[0].onclick = function () { if (winTracker) { winTracker.close(); } };
}
</script>
";
G::RenderPage("publish");
//note: url processmap "../designer?prj_uid=$_SESSION['PROCESS']&prj_readonly=true&app_uid=$_SESSION['APP_UID']"
break;
}
if (isset( $aFields['TITLE'] )) {
@@ -246,9 +283,8 @@ switch (($aCaseTracker['CT_MAP_TYPE'])) {
}.extend(this);
rpcRequest.make();
});' );
G::RenderPage( 'publish' );
break;
}