[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8854]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8854] |
|
Date: |
Tue, 14 Feb 2012 07:54:41 +0000 |
Revision: 8854
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8854
Author: vator
Date: 2012-02-14 07:54:40 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicase.inc.php
trunk/controller/js/controller/ajax.js
trunk/controller/templates/base/check_list/add_check_list.xsl
trunk/controller/templates/base/check_list/edit_check_list.xsl
trunk/controller/templates/base/control/control.xsl
trunk/controller/templates/base/control_location/register_control_to_location.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2012-02-14 07:21:07 UTC (rev
8853)
+++ trunk/controller/inc/class.uicase.inc.php 2012-02-14 07:54:40 UTC (rev
8854)
@@ -43,6 +43,8 @@
private $so;
private $so_check_list;
private $so_control;
+ private $so_control_item;
+ private $so_check_item;
var $public_functions = array(
'register_case' => true,
@@ -64,6 +66,7 @@
$this->so_check_list =
CreateObject('controller.socheck_list');
$this->so_control =
CreateObject('controller.socontrol');
$this->so_check_item =
CreateObject('controller.socheck_item');
+ $this->so_control_item =
CreateObject('controller.socontrol_item');
}
function register_case(){
@@ -154,7 +157,12 @@
$status_checker = new status_checker();
$status_checker->update_check_list_status(
$check_list_id );
- return json_encode( array( "status" => "saved",
"case" => $case->toArray() ) );
+ $check_item =
$this->so_check_item->get_single($case->get_check_item_id());
+ $control_item =
$this->so_control_item->get_single($check_item->get_control_item_id());
+
+ $type = $control_item->get_type();
+
+ return json_encode( array( "status" => "saved",
"type" => $type, "caseObj" => $case->toArray() ) );
}
else
return json_encode( array( "status" =>
"not_saved" ) );
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2012-02-14 07:21:07 UTC (rev
8853)
+++ trunk/controller/js/controller/ajax.js 2012-02-14 07:54:40 UTC (rev
8854)
@@ -523,8 +523,8 @@
var jsonObj = jQuery.parseJSON(data);
if(jsonObj.status == "saved"){
- // var case_id = "#case_" +
jsonObj.case.id;
- // var case_descr = jsonObj.case.descr;
+ var case_id = "#case_" +
jsonObj.caseObj.id;
+ var case_descr =
jsonObj.caseObj.descr;
$(case_id).show();
$(case_id).find(".case_descr").text(case_descr);
@@ -532,8 +532,7 @@
}
}
}
- });
-
+ });
});
$("a.quick_edit").live("click", function(e){
Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl
2012-02-14 07:21:07 UTC (rev 8853)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl
2012-02-14 07:54:40 UTC (rev 8854)
@@ -8,12 +8,16 @@
$( "#planned_date" ).datepicker({
monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
+ dateFormat: 'dd/mm-yy',
+ changeMonth: true,
+ changeYear: true
});
$( "#completed_date" ).datepicker({
monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
+ dateFormat: 'dd/mm-yy',
+ changeMonth: true,
+ changeYear: true
});
});
</script>
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-02-14 07:21:07 UTC (rev 8853)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-02-14 07:54:40 UTC (rev 8854)
@@ -9,17 +9,23 @@
$( "#planned_date" ).datepicker({
monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
+ dateFormat: 'dd/mm-yy',
+ changeMonth: true,
+ changeYear: true
});
$( "#completed_date" ).datepicker({
monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
+ dateFormat: 'dd/mm-yy',
+ changeMonth: true,
+ changeYear: true
});
$( "#deadline_date" ).datepicker({
monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
+ dateFormat: 'dd/mm-yy',
+ changeMonth: true,
+ changeYear: true
});
});
Modified: trunk/controller/templates/base/control/control.xsl
===================================================================
--- trunk/controller/templates/base/control/control.xsl 2012-02-14 07:21:07 UTC
(rev 8853)
+++ trunk/controller/templates/base/control/control.xsl 2012-02-14 07:54:40 UTC
(rev 8854)
@@ -13,12 +13,16 @@
$( "#start_date" ).datepicker({
monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'd/m-yy'
+ dateFormat: 'd/m-yy',
+ changeMonth: true,
+ changeYear: true
});
$( "#end_date" ).datepicker({
monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'd/m-yy'
+ dateFormat: 'd/m-yy',
+ changeMonth: true,
+ changeYear: true
});
});
</script>
Modified:
trunk/controller/templates/base/control_location/register_control_to_location.xsl
===================================================================
---
trunk/controller/templates/base/control_location/register_control_to_location.xsl
2012-02-14 07:21:07 UTC (rev 8853)
+++
trunk/controller/templates/base/control_location/register_control_to_location.xsl
2012-02-14 07:54:40 UTC (rev 8854)
@@ -33,10 +33,14 @@
</xsl:template>
<xsl:template match="control_filters" name="control_filters"
xmlns:php="http://php.net/xsl";>
- <div style="margin: 10px;padding: 10px; width: 25%;">
-
- <!-- When control area is chosen, an ajax request is executed.
The operation fetches controls from db and populates the control list.
- The ajax opearation is handled in ajax.js -->
+
+ <div id="choose_control">
+ <!--
+ When control area is chosen, an ajax request is
executed.
+ The operation fetches controls from db and populates
the control list.
+ The ajax opearation is handled in ajax.js
+ -->
+ <div class="error_msg">Du må velge kontroll før du kan legge
til bygg</div>
<select style="float:left;" id="control_area_list"
name="control_area_list">
<option value="">Velg kontrollområde</option>
<xsl:for-each select="control_areas_array2">
@@ -69,6 +73,7 @@
</xsl:template>
<xsl:template match="filter_form" xmlns:php="http://php.net/xsl";>
+
<form id="queryForm">
<xsl:attribute name="method">
<xsl:value-of select="phpgw:conditional(not(method),
'GET', method)"/>
@@ -80,13 +85,11 @@
<xsl:call-template name="filter_list"/>
</form>
- <form id="update_table_dummy" method='POST' action='' >
- </form>
+ <form id="update_table_dummy" method='POST' action='' ></form>
</xsl:template>
<xsl:template name="filter_list" xmlns:php="http://php.net/xsl";>
- <div>
<ul id="filters">
<li>
<select id="type_id" name="type_id">
@@ -138,8 +141,6 @@
<input type="submit" name="search"
value="{$lang_search}" title = "{$lang_search}" />
</li>
</ul>
-
- </div>
</xsl:template>
<xsl:template match="datatable" xmlns:php="http://php.net/xsl";>
@@ -173,15 +174,29 @@
function saveLocationToControl()
{
+ var control_id_value =
document.getElementById('control_id').value;
+
+ if( !(control_id_value > 0) ){
+ var choose_control_elem =
document.getElementById('choose_control');
+ var error_elem =
YAHOO.util.Dom.getElementsByClassName('error_msg')[0];
+
+ error_elem.style.display = 'block';
+
+ return false;
+ }else{
+ var error_elem =
YAHOO.util.Dom.getElementsByClassName('error_msg')[0];
+ error_elem.style.display = 'none';
+ }
+
var divs =
YAHOO.util.Dom.getElementsByClassName('location_submit');
var mydiv = divs[divs.length-1];
// styles for dont show
- mydiv.style.display = "none";
+
valuesForPHP =
YAHOO.util.Dom.getElementsByClassName('mychecks');
var values_return = ""; //new Array();
-
+
for(i=0;i<valuesForPHP.length;i++)
{
if(valuesForPHP[i].children[0].children[0].checked)
@@ -193,8 +208,20 @@
}
}
- var control_id_value =
document.getElementById('control_id').value;
+ if( !(values_return.length > 0) ){
+ var datatable_container_elem =
document.getElementById('datatable-container');
+ var error_elem =
YAHOO.util.Dom.getElementsByClassName('error_msg')[1];
+
+ error_elem.style.display = 'block';
+
+ return false;
+ }else{
+ var error_elem =
YAHOO.util.Dom.getElementsByClassName('error_msg')[1];
+ error_elem.style.display = 'none';
+ }
+ mydiv.style.display = "none";
+
var returnfield = document.createElement('input');
returnfield.setAttribute('name', 'values_assign');
returnfield.setAttribute('type', 'text');
@@ -210,7 +237,9 @@
]]>
</script>
<div id="data_paginator"/>
+ <div class="error_msg" style="margin-left:20px;">Du må velge bygg før
du kan legge til en kontroll</div>
<div id="datatable-container"/>
+
<xsl:call-template name="datasource-definition" />
<xsl:variable name="label_submit"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
<xsl:variable name="label_checkAll"><xsl:value-of
select="php:function('lang', 'invert_checkboxes')" /></xsl:variable>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-02-14 07:21:07 UTC
(rev 8853)
+++ trunk/controller/templates/base/css/base.css 2012-02-14 07:54:40 UTC
(rev 8854)
@@ -1332,3 +1332,24 @@
padding: 20px;
border: 1px solid #ABABAB;
}
+
+/* ======================== REGISTER CONTROL FOR LOCATION
============================== */
+#choose_control{
+ margin: 10px;
+ padding: 10px;
+ width: 25%;
+}
+.error_msg {
+ color: red;
+ display: none;
+ font-size: 14px;
+ padding: 7px 0;
+}
+
+#control_details #select_all{
+ margin-left: 660px;
+}
+#control_details #location_form{
+ margin-left: 20px;
+ margin-bottom: 20px;
+}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8854],
Torstein <=