[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12717] fix responsiblility_role
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12717] fix responsiblility_role |
|
Date: |
Fri, 06 Feb 2015 19:26:27 +0000 |
Revision: 12717
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12717
Author: sigurdne
Date: 2015-02-06 19:26:27 +0000 (Fri, 06 Feb 2015)
Log Message:
-----------
fix responsiblility_role
Modified Paths:
--------------
branches/dev-syncromind/property/inc/class.uilocation.inc.php
Added Paths:
-----------
branches/dev-syncromind/property/js/portico/location.responsiblility_role.js
Removed Paths:
-------------
branches/dev-syncromind/property/js/yahoo/location.responsiblility_role.js
Modified: branches/dev-syncromind/property/inc/class.uilocation.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilocation.inc.php
2015-02-06 19:25:59 UTC (rev 12716)
+++ branches/dev-syncromind/property/inc/class.uilocation.inc.php
2015-02-06 19:26:27 UTC (rev 12717)
@@ -1182,6 +1182,7 @@
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.jeditable.js');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.dataTables.editable.js');
+ self::add_javascript('property', 'portico',
'location.responsiblility_role.js');
$this->bo->get_responsible(array('user_id' => $user_id,
'role_id' =>$role_id, 'type_id'=>$type_id, 'allrows'=>$this->allrows));
@@ -1248,7 +1249,7 @@
$uicols['descr'][] = lang('select');
$uicols['sortable'][] = false;
$uicols['format'][] = '';
- $uicols['formatter'][] = $this->acl_edit ?
'JqueryPortico.formatCheck' : '';
+ $uicols['formatter'][] = $this->acl_edit ?
'myFormatterCheck' : '';
$uicols['input_type'][] = '';
$count_uicols_name = count($uicols['name']);
@@ -1333,12 +1334,7 @@
}
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
-
self::render_template_xsl('datatable_jquery', $data);
-
- // Prepare YUI Library
- //$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'location.responsiblility_role', 'property' );
-
}
Added:
branches/dev-syncromind/property/js/portico/location.responsiblility_role.js
===================================================================
---
branches/dev-syncromind/property/js/portico/location.responsiblility_role.js
(rev 0)
+++
branches/dev-syncromind/property/js/portico/location.responsiblility_role.js
2015-02-06 19:26:27 UTC (rev 12717)
@@ -0,0 +1,62 @@
+
+
+
/********************************************************************************
+ * Delete all message un DIV 'message'
+ */
+ this.create_message = function()
+ {
+ div_message= YAHOO.util.Dom.get("message");
+
+ //SHOW message if exist 'values_ds.message'
+ if(window.values_ds.message)
+ {
+ // succesfull
+ if(window.values_ds.message[0].message)
+ {
+ for(i=0; i<values_ds.message[0].message.length;
i++)
+ {
+ oDiv=document.createElement("DIV");
+ txtNode =
document.createTextNode(values_ds.message[0].message[i].msg);
+ oDiv.appendChild(txtNode);
+ oDiv.style.color = '#009900';
+ oDiv.style.fontWeight = 'bold';
+
+ div_message.appendChild(oDiv);
+ }
+ }
+
+ // error
+ if(window.values_ds.message[0].error)
+ {
+ for(i=0; i<values_ds.message[0].error.length;
i++)
+ {
+ oDiv=document.createElement("DIV");
+ txtNode =
document.createTextNode(values_ds.message[0].error[i].msg);
+ oDiv.appendChild(txtNode);
+ oDiv.style.color = '#FF0000';
+ oDiv.style.fontWeight = 'bold';
+
+ div_message.appendChild(oDiv);
+ }
+ }
+ }
+ window.values_ds.message = null;
+ }
+
+ var myFormatterCheck = function(key, oData)
+ {
+ var checked = '';
+ var hidden = '';
+ if(oData['responsible_item'])
+ {
+ checked = "checked = 'checked'";
+ hidden = "<input type=\"hidden\" class=\"orig_check\"
name=\"values[assign_orig][]\"
value=\""+oData['responsible_contact_id']+"_"+oData['responsible_item']+"_"+oData['location_code']+"\"/>";
+ }
+
+ return hidden + "<center><input type=\"checkbox\" "+checked+"
class=\"mychecks\" name=\"values[assign][]\"
value=\""+oData['location_code']+"\"/></center>";
+ };
+
+ var FormatterCenter = function(key, oData)
+ {
+ return "<center>"+oData[key]+"</center>";
+ }
\ No newline at end of file
Deleted:
branches/dev-syncromind/property/js/yahoo/location.responsiblility_role.js
===================================================================
--- branches/dev-syncromind/property/js/yahoo/location.responsiblility_role.js
2015-02-06 19:25:59 UTC (rev 12716)
+++ branches/dev-syncromind/property/js/yahoo/location.responsiblility_role.js
2015-02-06 19:26:27 UTC (rev 12717)
@@ -1,323 +0,0 @@
-//--------------------------------------------------------
-// Declaration of event.index vars
-//--------------------------------------------------------
- //define SelectButton
- var oMenuButton_0, oMenuButton_1, oMenuButton_2, oMenuButton_3,
oMenuButton_4;//, oMenuButton_5;
- var selectsButtons = [
- {order:0, var_URL:'type_id', name:'btn_type_id',
style:'typebutton', dependiente:[], reload:1},
- {order:1, var_URL:'cat_id', name:'btn_cat_id',
style:'categorybutton', dependiente:[]},
- {order:2, var_URL:'district_id', name:'btn_district_id',
style:'districtbutton', dependiente:[3]},
- {order:3,
var_URL:'part_of_town_id',name:'btn_part_of_town_id',style:'partOFTownbutton',dependiente:[]},
- {order:4, var_URL:'role_id', name:'btn_role_id',
style:'roleIdbutton', dependiente:[]}
-// {order:5, var_URL:'user_id', name:'btn_user_id',
style:'userIdbutton', dependiente:[]}, // dummy - changed to
select
- ];
-
- // define buttons
- var oNormalButton_0, oNormalButton_1;//, oNormalButton_2;
- var normalButtons = [
- {order:0, name:'btn_search', funct:"onSearchClick"},
- {order:1, name:'btn_save', funct:"onSave"}
- ];
-
- // define Text buttons
- var textImput = [
- {order:0, name:'query', id:'txt_query'}
- ];
-
- var toolTips =
- [
- {name:'status', title:'Status',
description:'',ColumnDescription:'status'},
- {name:'btn_export', title:'download', description:'Download
table to your browser',ColumnDescription:''}
- ];
-
- var linktoolTips =
- [
- {name:'btn_data_search', title:'Data search',
description:'Narrow the search dates'}
- ];
-
- var config_values =
- [
- {date_search : 0} //if search has link "Data search"
- ];
-
- var tableYUI;
-
/********************************************************************************
- *
- */
-
- this.onChangeSelect = function()
- {
- var myselect=document.getElementById("sel_user_id");
- for (var i=0; i<myselect.options.length; i++)
- {
- if (myselect.options[i].selected==true)
- {
- break;
- }
- }
- eval("path_values.user_id='"+myselect.options[i].value+"'");
- execute_ds();
- }
-
-
- this.myParticularRenderEvent = function()
- {
- delete_content_div("message",2); //find it in property.js
- create_message();
- tableYUI.deleteTFoot();
- addFooterDatatable();
- }
-
-
/********************************************************************************
- * Delete all message un DIV 'message'
- */
- this.create_message = function()
- {
- div_message= YAHOO.util.Dom.get("message");
-
- //SHOW message if exist 'values_ds.message'
- if(window.values_ds.message)
- {
- // succesfull
- if(window.values_ds.message[0].message)
- {
- for(i=0; i<values_ds.message[0].message.length;
i++)
- {
- oDiv=document.createElement("DIV");
- txtNode =
document.createTextNode(values_ds.message[0].message[i].msg);
- oDiv.appendChild(txtNode);
- oDiv.style.color = '#009900';
- oDiv.style.fontWeight = 'bold';
-
- div_message.appendChild(oDiv);
- }
- }
-
- // error
- if(window.values_ds.message[0].error)
- {
- for(i=0; i<values_ds.message[0].error.length;
i++)
- {
- oDiv=document.createElement("DIV");
- txtNode =
document.createTextNode(values_ds.message[0].error[i].msg);
- oDiv.appendChild(txtNode);
- oDiv.style.color = '#FF0000';
- oDiv.style.fontWeight = 'bold';
-
- div_message.appendChild(oDiv);
- }
- }
- }
- window.values_ds.message = null;
- }
-
- this.particular_setting = function()
- {
- if(flag_particular_setting=='init')
- {
- //locate (asign ID) to datatable
- tableYUI =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[0].parentNode;
- tableYUI.setAttribute("id","tableYUI");
-
- //type
- index =
locate_in_array_options(0,"value",path_values.type_id);
- if(index)
- {
- oMenuButton_0.set("label", ("<em>" +
array_options[0][index][1] + "</em>"));
- }
- //category
- index =
locate_in_array_options(1,"value",path_values.cat_id);
- if(index)
- {
- oMenuButton_1.set("label", ("<em>" +
array_options[1][index][1] + "</em>"));
- }
-
- //district
- index =
locate_in_array_options(2,"value",path_values.district_id);
- if(index)
- {
- oMenuButton_2.set("label", ("<em>" +
array_options[2][index][1] + "</em>"));
- }
- //user
- index =
locate_in_array_options(3,"value",path_values.user_id);
- if(index)
- {
- oMenuButton_3.set("label", ("<em>" +
array_options[3][index][1] + "</em>"));
- }
-
-// oMenuButton_0.focus();
- YAHOO.util.Dom.get(textImput[0].id).focus();
- }
- else if(flag_particular_setting=='update')
- {
- }
- }
-
-
-/****************************************************************************************/
-
- this.Exchange_values = function()
- {
- //nothing
- }
-
-/********************************************************************************/
- var myFormatterCheck = function(elCell, oRecord, oColumn, oData)
- {
- var checked = '';
- var hidden = '';
- if(oRecord.getData('responsible_item'))
- {
- checked = "checked = 'checked'";
- hidden = "<input type=\"hidden\" class=\"orig_check\"
name=\"values[assign_orig][]\"
value=\""+oRecord.getData('responsible_contact_id')+"_"+oRecord.getData('responsible_item')+"_"+oRecord.getData('location_code')+"\"/>";
- }
-
- elCell.innerHTML = hidden + "<center><input type=\"checkbox\"
"+checked+" class=\"mychecks\" name=\"values[assign][]\"
value=\""+oRecord.getData('location_code')+"\"/></center>";
- }
-
- var FormatterCenter = function(elCell, oRecord, oColumn, oData)
- {
- elCell.innerHTML = "<center>"+oData+"</center>";
- }
-
-/********************************************************************************/
-
- this.onSave = function()
- {
- //get the last div in th form
- var divs= YAHOO.util.Dom.getElementsByClassName('field');
- var mydiv = divs[divs.length-1];
- //remove all child of mydiv
- if (mydiv.hasChildNodes())
- {
- while ( mydiv.childNodes.length >= 1 )
- {
- mydiv.removeChild( mydiv.firstChild );
- }
- }
- // styles for dont show
- mydiv.style.display = "none";
-
- valuesForPHP =
YAHOO.util.Dom.getElementsByClassName('mychecks');
- valuesForPHP_orig =
YAHOO.util.Dom.getElementsByClassName('orig_check');
-
- var values_return =
- {
- assign:[],
- assign_orig:[]
- };
-
- //add all control to form
- for(i=0;i<valuesForPHP.length;i++)
- {
- //values_return.assign[i] = valuesForPHP[i].value;
- if(valuesForPHP[i].checked)
- {
-
values_return.assign.push(valuesForPHP[i].value);
- }
- }
-
- for(i=0;i<valuesForPHP_orig.length;i++)
- {
- //console.log(valuesForPHP_orig[i].name); // firebug
- values_return.assign_orig[i] =
valuesForPHP_orig[i].value;
- }
-
- var returnfield = document.createElement('input');
- returnfield.setAttribute('name', 'values_assign');
- returnfield.setAttribute('type', 'text');
- returnfield.setAttribute('value',
JSON.stringify(values_return));
- mydiv.appendChild(returnfield);
-
- // find out the unique form
- formObject = document.body.getElementsByTagName('form');
- // modify the 'form' for send it as POST using asyncronize call
- YAHOO.util.Connect.setForm(formObject[0]);
-
- maintain_pagination_order();
- execute_ds();
- }
-
-
-//----------------------------------------------------------
-
/********************************************************************************
- *
- */
- this.addFooterDatatable = function()
- {
- //Create ROW
- newTR = document.createElement('tr');
- var i = 0;
-
- for(var k=0 ; k<values_ds.headers.name.length; k++)
- {
- if (values_ds.headers.input_type[k] != 'hidden')
- {
- i++;
- }
- }
-
- td_empty(i+2);
-
- //RowChecked
- CreateRowChecked("mychecks");
-
- //Add to Table
- myfoot = tableYUI.createTFoot();
- myfoot.setAttribute("id","myfoot");
- myfoot.appendChild(newTR.cloneNode(true));
- //clean value for values_ds.message
- values_ds.message = null;
- }
-
-
/********************************************************************************
- *
- */
- check_all = function(myclass)
- {
- controls = YAHOO.util.Dom.getElementsByClassName(myclass);
- for(i=0;i<controls.length;i++)
- {
- if(!controls[i].disabled)
- {
- //for class=mychecks, they have to be
interchanged
- if(myclass=="mychecks")
- {
- if(controls[i].checked)
- {
- controls[i].checked = false;
- }
- else
- {
- controls[i].checked = true;
- }
- }
- //for the rest, always id checked
- else
- {
- controls[i].checked = true;
- }
- }
- }
- }
-
-
- //YAHOO.util.Event.addListener(window, "load", function()
- YAHOO.util.Event.onDOMReady(function()
- {
-
YAHOO.util.Dom.getElementsByClassName('toolbar','div')[0].style.display =
'none';
- var loader = new YAHOO.util.YUILoader();
- loader.addModule({
- name: "anyone", //module name; must be unique
- type: "js", //can be "js" or "css"
- fullpath: property_js //'property_js' have the path for
property.js, is render in HTML
- });
-
- loader.require("anyone");
-
- //Insert JSON utility on the page
-
- loader.insert();
-
- });
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12717] fix responsiblility_role,
Sigurd Nes <=