[Fmsystem-commits] [9687]

[Torstein]

Revision: 9687
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9687
Author:   vator
Date:     2012-06-27 15:16:06 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicalendar.inc.php
    trunk/controller/js/controller/ajax.js
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-06-27 14:59:40 UTC 
(rev 9686)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-06-27 15:16:06 UTC 
(rev 9687)
@@ -212,14 +212,13 @@
                        
                        // Validates year. If year is not set, current year is 
chosen
                        $year = $this->validate_year($year);
-echo " repeat type: " . $repeat_type;
+
                        // Validates year. 
                        $repeat_type = 
$this->validate_repeat_type($repeat_type);
                        
                        // Validates role. 
                        $role = $this->validate_role($role);
                        
-                       echo " repeat type: " . $repeat_type;
                        // Gets timestamp of first day in year
                        $from_date_ts = $this->get_start_date_year_ts($year);
 

Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js      2012-06-27 14:59:40 UTC (rev 
9686)
+++ trunk/controller/js/controller/ajax.js      2012-06-27 15:16:06 UTC (rev 
9687)
@@ -534,6 +534,8 @@
        $("#frm_add_check_list").live("submit", function(e){
                var thisForm = $(this);
                var statusFieldVal = $("#status").val();
+               var plannedDateVal = $("#planned_date").val();
+               var plannedDateRow = $("#planned_date").closest(".row");
                var completedDateVal = $("#completed_date").val();
                var completedDateRow = $("#completed_date").closest(".row");
                
@@ -542,6 +544,10 @@
                        e.preventDefault();
                        // Displays error message above completed date
                        $(completedDateRow).before("<div 
class='input_error_msg'>Vennligst angi når kontrollen ble utført</div>");
+               }else if(statusFieldVal == 0 & plannedDateVal == ''){
+                       e.preventDefault();
+                       // Displays error message above completed date
+                       $(plannedDateRow).before("<div 
class='input_error_msg'>Vennligst endre status for kontroll eller angi 
planlagtdato</div>");
                }               
        });     
        

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-06-27 14:59:40 UTC 
(rev 9686)
+++ trunk/controller/templates/base/css/base.css        2012-06-27 15:16:06 UTC 
(rev 9687)
@@ -1371,11 +1371,11 @@
 #info_box {
     background: none repeat scroll 0 0 #EDF5FF;
     border: 1px solid #98B4D6;
-    display: none;
+    display: block;
     float: none;
     font-size: 12px;
-    height: 200px;
     left: 40px;
+    overflow: hidden;
     padding: 10px;
     position: absolute;
     text-align: left;
@@ -1383,28 +1383,34 @@
     width: 400px;
     z-index: 1;
 }
+
 #info_box h3 {
        background: none repeat scroll 0 0 #D1E3F8;
     margin: 0 0 10px;
     padding: 5px 0;
     text-align: center;
 }
+
 #info_box h5 {
     font-size: 13px;
     font-weight: bold;
     margin: 0 0 4px;
     text-align: left;
 }
+
 #info_box .check_item {
        width: 100%     
 }
+
 #info_box .check_item label{
        display:inline;
        margin-left:20px;       
 }
+
 #info_box .case {
        text-align:left;        
 }
+
 .empty_list{
        font-size: 16px;
     font-weight: bold;
@@ -2105,7 +2111,7 @@
 }
 
 .no-comp-msg {
-       font-size: 16px;
-  padding-left: 85px;  
+  font-size: 16px;
+  padding-left: 12px;
 }