|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [8658] |
| Date: | Tue, 24 Jan 2012 08:35:18 +0000 |
Revision: 8658
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8658
Author: vator
Date: 2012-01-24 08:35:18 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicontrol.inc.php
trunk/controller/inc/class.uicontrol_item.inc.php
trunk/controller/js/controller/ajax.js
trunk/controller/js/controller/custom_drag_drop.js
trunk/controller/templates/base/control_item/sort_check_list.xsl
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2012-01-23 15:25:33 UTC
(rev 8657)
+++ trunk/controller/inc/class.uicontrol.inc.php 2012-01-24 08:35:18 UTC
(rev 8658)
@@ -246,9 +246,9 @@
// Sigurd: START as categories
$cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
$cats->supress_info = true;
-
- $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$control->get_control_area_id(),'globals' => true,'use_acl' =>
$this->_category_acl));
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','globals' => true,'use_acl'
=> $this->_category_acl));
+
$control_areas_array2 = array();
foreach($control_areas['cat_list'] as $cat_list)
{
@@ -260,7 +260,9 @@
}
// END as categories
- $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control->get_control_area_id());
+ if($control != null)
+ $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control->get_control_area_id());
+
$role_array = $this->so->get_roles();
$repeat_type_array = array(
@@ -289,7 +291,6 @@
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_check_list',
'control_id' => $control->get_id()))
)
-
);
}
else
@@ -310,7 +311,7 @@
'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
'view'
=> "control_details",
'editable'
=> true,
- 'control'
=> $control->toArray(),
+ 'control'
=> ($control != null) ? $control->toArray() : null,
'control_areas_array2' =>
$control_areas_array2,
'procedures_array' =>
$procedures_array,
'role_array' =>
$role_array,
@@ -400,17 +401,20 @@
array(
'label' => "1: " .
lang('Details'),
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details',
-
'id' => $control_id))
- ),
- array(
- 'label' => "2: " .
lang('Choose_control_groups')
- ),
- array(
- 'label' => "3: " .
lang('Choose_control_items')
- ),
- array(
- 'label' => "4: " .
lang('Sort_check_list')
- ));
+
'id' => $control->get_id()))
+ ),array(
+ 'label' => "2: " .
lang('Choose_control_groups'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_groups',
+
'control_id' => $control->get_id()))
+ ),array(
+ 'label' => "3: " .
lang('Choose_control_items'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_items',
+
'control_id' => $control->get_id()))
+ ),array('label' => "4: " .
lang('Sort_check_list'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_check_list',
+
'control_id' => $control->get_id()))
+ )
+ );
$data = array
(
@@ -497,18 +501,21 @@
$tabs = array(
array(
'label' => "1: " .
lang('Details'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details', 'view' => "view_control_details",
-
'id' => $control_id))
- ),
- array(
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details',
+
'id' => $control->get_id()))
+ ),array(
'label' => "2: " .
lang('Choose_control_groups'),
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_groups',
-
'control_id' => $control_id))
- ),
- array('label' => "3: " .
lang('Choose_control_items')),
- array(
- 'label' => "4: " .
lang('Sort_check_list')
- ));
+
'control_id' => $control->get_id()))
+ ),array(
+ 'label' => "3: " .
lang('Choose_control_items'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_items',
+
'control_id' => $control->get_id()))
+ ),array('label' => "4: " .
lang('Sort_check_list'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_check_list',
+
'control_id' => $control->get_id()))
+ )
+ );
$data = array
(
Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php 2012-01-23 15:25:33 UTC
(rev 8657)
+++ trunk/controller/inc/class.uicontrol_item.inc.php 2012-01-24 08:35:18 UTC
(rev 8658)
@@ -193,15 +193,23 @@
$control_id = phpgw::get_var('control_id');
$control_group_id = phpgw::get_var('control_group_id');
- $order_nr = phpgw::get_var('order_nr');
+ $order_tags = phpgw::get_var('order_tags');
+ echo "Order tags : ";
+ print_r($order_tags);
+
+
$status = true;
- foreach($order_nr as $order_tag){
+ foreach($order_tags as $order_tag){
$control_item_id = substr($order_tag,
strpos($order_tag, ":")+1, strlen($order_tag));
$order_nr = substr($order_tag, 0,
strpos($order_tag, ":"));
$control_item_list =
$this->so_control_item_list->get_single_2($control_id, $control_item_id);
+ echo "Order nr : " . $order_nr;
+ echo "Control item list : ";
+ print_r( $control_item_list );
+
if($order_nr !=
$control_item_list->get_order_nr() ){
$control_item_list->set_order_nr($order_nr);
@@ -211,7 +219,13 @@
}
}
- return status;
+ return $status;
+
+ if($status)
+ return json_encode( array( "status" =>
"order_updated" ) );
+ else
+ return json_encode( array( "status" =>
"order_not_updated" ) );
+
}
public function delete_item_list(){
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2012-01-23 15:25:33 UTC (rev
8657)
+++ trunk/controller/js/controller/ajax.js 2012-01-24 08:35:18 UTC (rev
8658)
@@ -121,7 +121,7 @@
var order_nr_array;
var requestUrl = $(thisForm).attr("action");
- $(this).find("input[name='order_nr[]']").each(function() {
+ $(this).find("input[name='order_tags[]']").each(function() {
order_nr_array += $(this).val() + ",";
});
@@ -371,7 +371,7 @@
// Updating order numbers for
rows below deleted row
while( $(next_row).length > 0){
-
update_order_nr(next_row, "-");
+
update_order_nr_for_row(next_row, "-");
next_row =
$(next_row).next();
}
}else{
@@ -420,7 +420,7 @@
//Updates order number for hidden field and number in front of row
-function update_order_nr(element, sign){
+function update_order_nr_for_row(element, sign){
var span_order_nr = $(element).find("span.order_nr");
var order_nr = $(span_order_nr).text();
Modified: trunk/controller/js/controller/custom_drag_drop.js
===================================================================
--- trunk/controller/js/controller/custom_drag_drop.js 2012-01-23 15:25:33 UTC
(rev 8657)
+++ trunk/controller/js/controller/custom_drag_drop.js 2012-01-24 08:35:18 UTC
(rev 8658)
@@ -188,7 +188,7 @@
function update_order_nr(element, sign){
var hidden_order_nr = $(element).find("input");
var order_value = $(hidden_order_nr).attr("value");
-
+
var span_order_nr = $(element).find("span.order_nr");
var order_nr = order_value.substring( 0, order_value.indexOf(":") );
Modified: trunk/controller/templates/base/control_item/sort_check_list.xsl
===================================================================
--- trunk/controller/templates/base/control_item/sort_check_list.xsl
2012-01-23 15:25:33 UTC (rev 8657)
+++ trunk/controller/templates/base/control_item/sort_check_list.xsl
2012-01-24 08:35:18 UTC (rev 8658)
@@ -10,50 +10,60 @@
<ul class="groups">
<xsl:for-each select="saved_groups_with_items_array">
- <li class="drag_group list_item">
- <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
-
- <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
- <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
- <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
+ <xsl:choose>
+ <xsl:when test="control_items/child::node()">
+ <li class="drag_group list_item">
+ <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
- <ul id="list">
- <xsl:for-each
select="control_items">
- <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
- <xsl:variable
name="order_tag">
-
<xsl:choose>
-
<xsl:when test="order_nr > 0">
-
<xsl:value-of select="order_nr"/>
-
</xsl:when>
-
<xsl:otherwise>
-
<xsl:number/>
-
</xsl:otherwise>
-
</xsl:choose>:<xsl:value-of select="id"/>
- </xsl:variable>
-
- <li
class="list_item">
- <span
class="drag">
-
<span class="order_nr"><xsl:number/></span>. <xsl:value-of
select="title"/><input type="hidden" name="order_nr[]" value="{$order_tag}" />
- </span>
- <a
class="delete">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="//control_id"/>
-
<xsl:text>&control_item_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
-
<span>x</span>
- </a>
- </li>
- </xsl:for-each>
- </ul>
- <div>
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
- <input type="submit"
id="save_order" name="save_order" value="{$lang_save}" title = "{$lang_save}"
style="opacity: 0.5;" disabled="disabled"/>
- </div>
- </form>
- </li>
+ <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
+ <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
+ <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
+
+ <ul id="list">
+ <xsl:for-each
select="control_items">
+
<xsl:variable name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+
<xsl:variable name="order_tag">
+
<xsl:choose>
+
<xsl:when test="order_nr > 0">
+
<xsl:value-of select="order_nr"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:number/>
+
</xsl:otherwise>
+
</xsl:choose>:<xsl:value-of select="id"/>
+
</xsl:variable>
+
+ <li
class="list_item">
+
<span class="drag">
+
<span class="order_nr"><xsl:number/></span>. <xsl:value-of
select="title"/><input type="hidden" name="order_tags[]" value="{$order_tag}" />
+
</span>
+
<a class="delete">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="//control_id"/>
+
<xsl:text>&control_item_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
</xsl:attribute>
+
<span>x</span>
+
</a>
+ </li>
+ </xsl:for-each>
+ </ul>
+ <div>
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
+ <input
type="submit" id="save_order" name="save_order" value="{$lang_save}" title =
"{$lang_save}" style="opacity: 0.5;" disabled="disabled"/>
+ </div>
+ </form>
+ </li>
+ </xsl:when>
+ <xsl:otherwise>
+ <li class="drag_group list_item">
+ <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
+ <div>Ingen kontrollpunkt for
denne gruppen</div>
+ </li>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:for-each>
</ul>
</div>
| [Prev in Thread] | Current Thread | [Next in Thread] |