fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #1257 from marcoAntonioNina/BUG-10548

Browse Source 
BUG 10548 Case Notes. After adding case notes, ProcessMaker... IMPROVEMENT
This commit is contained in:
julceslauhub
2013-01-30 05:25:27 -08:00
parent bb81421f8f cd1dab6849
commit 68b92ac497
3 changed files with 98 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
workflow/engine/skinEngine/simplified/templates/appList.html
View File

@@ -22,7 +22,6 @@
color : #808080;
/*font : normal 8pt sans-serif,Tahoma,MiscFixed;*/
background-color:#ECECEC;
}
#note_text {
@@ -59,30 +58,57 @@
}
}
function addNt(appUid)
function addNt(appUid, proUid, tasUid)
{
$('textarea#note_text').val('');
$( "#dialog-add-note" ).dialog({
resizable: false,
height:178,
modal: true,
buttons: {
"Add Note": function() {
$(this).dialog("close");
$.post(
'../appProxy/postNote',
{appUid: appUid, noteText: $('textarea#note_text').val()},
function(responseText) {
updateNt(appUid);
}
);
//redirect('home/startCase?id='+id);
$.post(
'../appProxy/getNotesList',
{
appUid : appUid,
pro:proUid,
tas:tasUid,
start:0,
limit:25
},
Cancel: function() {
$(this).dialog( "close" );
function(responseText) {
data = jQuery.parseJSON(responseText);
if (typeof (data.noPerms) != 'undefined') {
alert(noPerms);
return false;
} else {
$( "#dialog-add-note" ).dialog({
resizable: false,
height:192,
modal: true,
buttons: {
"Add Note": function() {
var sendMail = document.getElementById('chkSendMail').checked;
sendMail = (sendMail == true) ? '1' : '0';
$(this).dialog("close");
$.post(
'../appProxy/postNote',
{appUid : appUid,
noteText: $('textarea#note_text').val(),
swSendMail : sendMail},
function(responseText) {
updateNt(appUid);
}
);
//redirect('home/startCase?id='+id);
},
Cancel: function() {
$(this).dialog( "close" );
}
}
});
}
//updateNt(appUid);
}
}
});
);
}
function updateNt(appUid)
@@ -143,6 +169,7 @@
var appListLimit = {$appListLimit};
var appListStart = {$appListStart};
var listType = '{$listType}';
var noPerms = '{$noPerms}';
</script>
</head>
@@ -167,6 +194,10 @@
<p><!-- <span class="ui-icon ui-icon-document" style="float:left; margin:0 7px 20px 0;"></span> -->
<span id="startAppTitle"/>
<textarea id="note_text" rows="2" cols="22"></textarea>
<div class="x-form-check-wrap" id="ext-gen160" style="font-size:11px">
<input type="checkbox" name="chkSendMail" id="chkSendMail" autocomplete="off" class=" x-form-checkbox x-form-field" checked="">
<label class="x-form-cb-label" for="chkSendMail" id="ext-gen161">Send email (Case Participants)</label>
</div>
</p>
</div>
<br/>

68
workflow/engine/skinEngine/simplified/templates/appListSearch.html
View File

@@ -125,34 +125,55 @@
}
}
function addNt(appUid)
function addNt(appUid, proUid, tasUid)
{
$('textarea#note_text').val('');
$( "#dialog-add-note" ).dialog({
resizable: false,
height:192,
modal: true,
buttons: {
"Add Note": function() {
var sendMail = document.getElementById('chkSendMail').checked;
sendMail = (sendMail == true) ? '1' : '0';
$(this).dialog("close");
$.post(
'../appProxy/postNote',
{appUid : appUid,
noteText: $('textarea#note_text').val(),
swSendMail : sendMail},
function(responseText) {
updateNt(appUid);
$.post(
'../appProxy/getNotesList',
{
appUid : appUid,
pro:proUid,
tas:tasUid,
start:0,
limit:25
},
function(responseText) {
console.log(responseText);
data = jQuery.parseJSON(responseText);
console.log(data.noPerms);
if (typeof (data.noPerms) != 'undefined') {
alert(noPerms);
return false;
} else {
$( "#dialog-add-note" ).dialog({
resizable: false,
height:192,
modal: true,
buttons: {
"Add Note": function() {
var sendMail = document.getElementById('chkSendMail').checked;
sendMail = (sendMail == true) ? '1' : '0';
$(this).dialog("close");
$.post(
'../appProxy/postNote',
{appUid : appUid,
noteText: $('textarea#note_text').val(),
swSendMail : sendMail},
function(responseText) {
updateNt(appUid);
}
);
//redirect('home/startCase?id='+id);
},
Cancel: function() {
$(this).dialog( "close" );
}
}
);
//redirect('home/startCase?id='+id);
},
Cancel: function() {
$(this).dialog( "close" );
});
}
//updateNt(appUid);
}
});
);
}
function addPanelSearch()
{
@@ -246,6 +267,7 @@
var appListLimit = {$appListLimit};
var appListStart = {$appListStart};
var noPerms = '{$noPerms}';
var listType = '{$listType}';
var process = '{$arraySearch[0]}';
var status = '{$arraySearch[1]}';

2
workflow/engine/skinEngine/simplified/templates/applications.html
View File

@@ -9,7 +9,7 @@
</span>
<span class="notes-plus-link">
<a href="#" onclick="addNt('{$APP.APP_UID}', '{$APP.APP_UID}'); return false;"><img src="/images/simplified/messages-grey-plus.png" height="21" width="21" border="0"></a>
<a href="#" onclick="addNt('{$APP.APP_UID}', '{$APP.PRO_UID}', '{$APP.TAS_UID}'); return false;"><img src="/images/simplified/messages-grey-plus.png" height="21" width="21" border="0"></a>
</span>
<p>