[Fmsystem-commits] [8685]

[Torstein]

Revision: 8685
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8685
Author:   vator
Date:     2012-01-25 10:14:05 +0000 (Wed, 25 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/inc/class.uicontrol.inc.php
    trunk/controller/js/controller/ajax.js
    trunk/controller/templates/base/control_group/control_groups.xsl

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2012-01-25 10:03:54 UTC 
(rev 8684)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2012-01-25 10:14:05 UTC 
(rev 8685)
@@ -54,18 +54,18 @@
                //      'save_check_list'                                       
=>      true,
                //      'view_check_list'                                       
=>      true,
                //      'edit_check_list'                                       
=>      true,
-                       'save_check_items'                                      
=>      true,
-                       'save_check_item'                                       
=>      true,
-                       'get_check_list_info'                           =>      
true,
+               //      'save_check_items'                                      
=>      true,
+               //      'save_check_item'                                       
=>      true,
+               //      'get_check_list_info'                           =>      
true,
                //      'control_calendar_status_overview'      =>      true,
-                       'add_check_item_to_list'                        =>      
true,
-                       'view_control_items'                            =>      
true,
+               //      'add_check_item_to_list'                        =>      
true,
+               //      'view_control_items'                            =>      
true,
                        //'view_control_details'                                
=>      true,
                        //'register_case'                                       
        =>      true,
                        //'view_open_cases'                                     
=>      true,
                        //'view_closed_cases'                                   
=>      true,
                        //'view_measurements'                                   
=>      true,
-                       'get_cases_for_check_list'                      =>      
true
+               //      'get_cases_for_check_list'                      =>      
true
                );
 
                public function __construct()

Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php        2012-01-25 10:03:54 UTC 
(rev 8684)
+++ trunk/controller/inc/class.uicontrol.inc.php        2012-01-25 10:14:05 UTC 
(rev 8685)
@@ -380,6 +380,8 @@
                        );
                        
                        self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
+                       self::add_javascript('controller', 'controller', 
'jquery.js');
+                       self::add_javascript('controller', 'controller', 
'ajax.js');
                        self::render_template_xsl(array('control/control_tabs', 
'control_group/control_groups'), $data);
                }
                
@@ -465,6 +467,7 @@
                        self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
                        self::add_javascript('controller', 'controller', 
'jquery.js');
                        self::add_javascript('controller', 'controller', 
'custom_ui.js');
+                       self::add_javascript('controller', 'controller', 
'ajax.js');
                        self::render_template_xsl(array('control/control_tabs', 
'control_item/choose_control_items'), $data); 
                }
                

Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js      2012-01-25 10:03:54 UTC (rev 
8684)
+++ trunk/controller/js/controller/ajax.js      2012-01-25 10:14:05 UTC (rev 
8685)
@@ -144,12 +144,37 @@
                                }
                        });     
        });
-
+       
+       $("#frm_save_control_groups").submit(function(e){
+               var thisForm = $(this);
+               var num_checked = $(this).find("input:checked").length;
+               
+               if(num_checked == 0){
+                       e.preventDefault();                     
+                       $(thisForm).before("<div style='margin: 10px 
0;text-align: center;width: 200px;' class='input_error_msg'>Du må velge en 
eller flere grupper</div>");
+               }
+       });
+       
+       $("#frm_control_items").submit(function(e){
+               var thisForm = $(this);
+               var num_checked = $(this).find("input:checked").length;
+               
+               if(num_checked == 0){
+                       e.preventDefault();                     
+                       $(thisForm).before("<div style='margin: 10px 
0;text-align: center;width: 200px;' class='input_error_msg'>Du må velge en 
eller flere punkter</div>");
+               }
+       });
+       
        $("#frm_save_control_details input").focus(function(e){
                
$("#frm_save_control_details").find(".focus").removeClass("focus");
                $(this).addClass("focus");
        });
        
+       $("#frm_save_control_details input").focus(function(e){
+               
$("#frm_save_control_details").find(".focus").removeClass("focus");
+               $(this).addClass("focus");
+       });
+       
        $("#frm_save_control_details select").focus(function(e){
                
$("#frm_save_control_details").find(".focus").removeClass("focus");
                $(this).addClass("focus");

Modified: trunk/controller/templates/base/control_group/control_groups.xsl
===================================================================
--- trunk/controller/templates/base/control_group/control_groups.xsl    
2012-01-25 10:03:54 UTC (rev 8684)
+++ trunk/controller/templates/base/control_group/control_groups.xsl    
2012-01-25 10:14:05 UTC (rev 8685)
@@ -6,7 +6,7 @@
        
                <h2><xsl:value-of select="control_area/title"/></h2>
                
-               <form 
action="index.php?menuaction=controller.uicontrol.save_control_groups" 
method="post">
+               <form id="frm_save_control_groups" 
action="index.php?menuaction=controller.uicontrol.save_control_groups" 
method="post">
                        <xsl:variable name="control_area_id"><xsl:value-of 
select="control_area/id"/></xsl:variable>
                        <input type="hidden" name="control_area_id" 
value="{$control_area_id}" />