[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8513]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8513] |
|
Date: |
Sat, 07 Jan 2012 10:38:11 +0000 |
Revision: 8513
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8513
Author: vator
Date: 2012-01-07 10:38:09 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicheck_list_for_location.inc.php
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/js/controller/ajax.js
trunk/controller/js/controller/custom_drag_drop.js
trunk/controller/js/controller/custom_ui.js
trunk/controller/setup/setup.inc.php
trunk/controller/setup/tables_current.inc.php
trunk/controller/setup/tables_update.inc.php
trunk/controller/templates/base/check_list/edit_check_list.xsl
trunk/controller/templates/base/check_list/view_closed_errors.xsl
trunk/controller/templates/base/check_list/view_control_info.xsl
trunk/controller/templates/base/check_list/view_measurements.xsl
trunk/controller/templates/base/check_list/view_open_errors.xsl
trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-01-06 19:53:59 UTC
(rev 8512)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-01-07 10:38:09 UTC
(rev 8513)
@@ -511,8 +511,8 @@
$data = array
(
- 'open_check_items'
=> $open_check_items,
- 'check_list' => $check_list->toArray()
+ 'open_check_items' => $open_check_items,
+ 'check_list' =>
$check_list->toArray()
);
$xslttemplate = CreateObject('phpgwapi.xslttemplates');
Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-06 19:53:59 UTC (rev 8512)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-07 10:38:09 UTC (rev 8513)
@@ -369,44 +369,6 @@
$check_list =
$this->so_check_list->get_single($check_list_id);
- // Fetches with check items
- $open_check_items =
$this->so_check_item->get_check_items($check_list_id, 'open',
'control_item_type_1');
-
- // Fetches check list with check items
- $handled_check_items =
$this->so_check_item->get_check_items($check_list_id, 'handled',
'control_item_type_1');
-
- $location_code = $check_list->get_location_code();
-
- // Fetches all control items for check list
- $control_items_for_check_list =
$this->so_control_item->get_control_items_by_control_id($check_list->get_control_id());
-
- // Fetches check items that registeres measurement
- $measurement_check_items =
$this->so_check_item->get_check_items($check_list_id, null,
'control_item_type_2');
-
- // Puts ids for control items that is registered as
open check item in an array
- $control_item_ids = array();
- foreach($open_check_items as $check_item){
- $control_item_ids[] =
$check_item["control_item_id"];
- }
-
- // Puts ids for control items that is registered as
handled check item in an array
- foreach($handled_check_items as $check_item){
- $control_item_ids[] =
$check_item["control_item_id"];
- }
-
- // Puts ids for control items that is registered check
item measurements in an array
- foreach($measurement_check_items as $check_item){
- $control_item_ids[] =
$check_item["control_item_id"];
- }
-
- // Puts control items not registered as check item in
an array
- $control_items_not_registered = array();
- foreach($control_items_for_check_list as $control_item){
- if( !in_array($control_item->get_id(),
$control_item_ids) ){
- $control_items_not_registered[] =
$control_item->toArray();
- }
- }
-
$date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
@@ -414,10 +376,6 @@
$data = array
(
'check_list'
=> $check_list->toArray(),
- 'open_check_items'
=> $open_check_items,
- 'handled_check_items' =>
$handled_check_items,
- 'measurement_check_items' =>
$measurement_check_items,
- 'control_items_not_registered' =>
$control_items_not_registered,
'location_array'
=> $location_array,
'date_format'
=> $date_format
);
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2012-01-06 19:53:59 UTC
(rev 8512)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2012-01-07 10:38:09 UTC
(rev 8513)
@@ -505,6 +505,10 @@
'group_procedures_array' =>
$group_procedures_array
);
+
+
self::render_template_xsl('procedure/view_procedures_for_control',
array('view_procedures_for_control' => $data));
+
+ /*
$xslttemplate = CreateObject('phpgwapi.xslttemplates');
$xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/procedure/view_procedures_for_control'));
@@ -527,6 +531,7 @@
$html = $proc->transformToXML($xml);
echo $html;
+ */
}
public function print_procedure(){
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2012-01-06 19:53:59 UTC (rev
8512)
+++ trunk/controller/js/controller/ajax.js 2012-01-07 10:38:09 UTC (rev
8513)
@@ -191,8 +191,7 @@
$(infoBox).hide();
});
- // file: edit_check_list.xsl
- $(".frm_save_check_item").submit(function(e){
+ $("#frm_save_check_item").live("submit", function(e){
e.preventDefault();
var thisForm = $(this);
var liWrp = $(this).parent();
@@ -232,8 +231,7 @@
});
});
- // file: edit_check_list.xsl
- $(".frm_save_control_item").submit(function(e){
+ $(".frm_save_control_item").live("click", function(e){
e.preventDefault();
var thisForm = $(this);
var liWrp = $(this).parent();
@@ -257,8 +255,7 @@
});
});
- // file: edit_check_list.xsl
- $("#frm_update_check_list").submit(function(e){
+ $("#frm_update_check_list").live("click", function(e){
e.preventDefault();
var thisForm = $(this);
@@ -287,18 +284,21 @@
});
});
- // file: edit_check_list.xsl
- $("#frm_update_check_list").click(function(e){
+ $("#frm_update_check_list").live("click", function(e){
var thisForm = $(this);
var submitBnt = $(thisForm).find("input[type='submit']");
$(submitBnt).removeClass("not_active");
});
-
- // file: add_check_list_for_location.xsl
- $("#frm_add_check_list").click(function(e){
+ $("#frm_add_check_list").live("click", function(e){
var thisForm = $(this);
var submitBnt = $(thisForm).find("input[type='submit']");
$(submitBnt).removeClass("not_active");
});
+
+ $("#frm_save_check_item").live("click", function(e){
+ var thisForm = $(this);
+ var submitBnt = $(thisForm).find("input[type='submit']");
+ $(submitBnt).removeClass("not_active");
+ });
});
\ No newline at end of file
Modified: trunk/controller/js/controller/custom_drag_drop.js
===================================================================
--- trunk/controller/js/controller/custom_drag_drop.js 2012-01-06 19:53:59 UTC
(rev 8512)
+++ trunk/controller/js/controller/custom_drag_drop.js 2012-01-07 10:38:09 UTC
(rev 8513)
@@ -49,7 +49,7 @@
});
// Delete a control item list
- $(".delete").click(function(){
+ $(".delete").live("click", function(){
var clickElem = $(this);
var clickRow = $(this).parent();
Modified: trunk/controller/js/controller/custom_ui.js
===================================================================
--- trunk/controller/js/controller/custom_ui.js 2012-01-06 19:53:59 UTC (rev
8512)
+++ trunk/controller/js/controller/custom_ui.js 2012-01-07 10:38:09 UTC (rev
8513)
@@ -6,7 +6,7 @@
/*
===============================================================================
*/
- $(".expand_list h4").click(function(){
+ $(".expand_list h4").live("click", function(){
if( $(this).parent().parent().hasClass('active')){
$(this).parent().find("ul").slideUp("slow");
$(this).find("img").attr("src",
"controller/images/arrow_right.png");
@@ -18,7 +18,7 @@
}
});
- $(".expand_all").click(function(){
+ $(".expand_all").live("click", function(){
$(this).addClass("focus");
$(".collapse_all").removeClass("focus");
@@ -27,7 +27,7 @@
$("ul.expand_list").find("li h4 img").attr("src",
"controller/images/arrow_down.png");
});
- $(".collapse_all").click(function(){
+ $(".collapse_all").live("click", function(){
$(this).addClass("focus");
$(".expand_all").removeClass("focus");
@@ -38,7 +38,7 @@
/*
===============================================================================
*/
- $("ul.check_items.expand_list h4").click(function(){
+ $("ul.check_items.expand_list h4").live("click", function(){
if( $(this).parent().hasClass('expanded')){
$(this).parent().find(".check_item").slideUp("slow");
$(this).find("img").attr("src",
"controller/images/arrow_right.png");
@@ -50,7 +50,7 @@
}
});
- $(".expand_all").click(function(){
+ $(".expand_all").live("click", function(){
$(this).addClass("focus");
$(".collapse_all").removeClass("focus");
@@ -59,7 +59,7 @@
$("ul.expand_list").find("li h4 img").attr("src",
"controller/images/arrow_down.png");
});
- $(".collapse_all").click(function(){
+ $(".collapse_all").live("click", function(){
$(this).addClass("focus");
$(".expand_all").removeClass("focus");
Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php 2012-01-06 19:53:59 UTC (rev
8512)
+++ trunk/controller/setup/setup.inc.php 2012-01-07 10:38:09 UTC (rev
8513)
@@ -1,6 +1,6 @@
<?php
$setup_info['controller']['name'] = 'controller';
- $setup_info['controller']['version'] = '0.1.15';
+ $setup_info['controller']['version'] = '0.1.17';
$setup_info['controller']['app_order'] = 100;
$setup_info['controller']['enable'] = 1;
$setup_info['controller']['app_group'] = 'office';
Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php 2012-01-06 19:53:59 UTC
(rev 8512)
+++ trunk/controller/setup/tables_current.inc.php 2012-01-07 10:38:09 UTC
(rev 8513)
@@ -58,9 +58,7 @@
'control_item_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'status' => array('type' => 'bool','nullable'
=> true,'default' => 'false'),
'comment' => array('type' =>
'varchar','precision' => '255','nullable' => False),
- 'check_list_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
- 'message_ticket_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
- 'measurement' => array('type' => 'int',
'precision' => 8, 'nullable' => True)
+ 'check_list_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True)
),
'pk' => array('id'),
'fk' => array(),
@@ -189,4 +187,16 @@
'ix' => array(),
'uc' => array()
),
+ 'controller_check_item_case', array(
+ 'fd' => array(
+ 'id' => array('type'
=> 'auto', 'nullable' => false),
+ 'check_item_id' => array('type'
=> 'int', 'precision' => '4', 'nullable' => false),
+ 'message_ticket_id' => array('type' =>
'int', 'precision' => '12', 'nullable' => true),
+ 'measurement' => array('type'
=> 'int', 'precision' => '12', 'nullable' => true)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
);
Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php 2012-01-06 19:53:59 UTC
(rev 8512)
+++ trunk/controller/setup/tables_update.inc.php 2012-01-07 10:38:09 UTC
(rev 8513)
@@ -317,4 +317,47 @@
$GLOBALS['setup_info']['controller']['currentver'] = '0.1.15';
return $GLOBALS['setup_info']['controller']['currentver'];
}
-
\ No newline at end of file
+
+ $test[] = '0.1.15';
+ function controller_upgrade0_1_15()
+ {
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('controller_check_item', array(),
'message_ticket_id');
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('controller_check_item', array(),
'measurement');
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'controller_check_item_case', array(
+ 'fd' => array(
+ 'id' => array('type'
=> 'auto', 'nullable' => false),
+ 'check_item_id' => array('type'
=> 'int', 'precision' => '4', 'nullable' => false),
+ 'message_ticket_id' => array('type' =>
'int', 'precision' => '4', 'nullable' => true),
+ 'measurement' => array('type'
=> 'int', 'precision' => '4', 'nullable' => true)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['setup_info']['controller']['currentver'] = '0.1.16';
+ return $GLOBALS['setup_info']['controller']['currentver'];
+ }
+
+ $test[] = '0.1.16';
+ function controller_upgrade0_1_16()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('controller_check_item_case','message_ticket_id',array(
+ 'type' => 'int',
+ 'precision' => '8',
+ 'nullable' => true
+ ));
+
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('controller_check_item_case','measurement',array(
+ 'type' => 'varchar',
+ 'precision' => '50',
+ 'nullable' => true
+ ));
+
+ $GLOBALS['setup_info']['controller']['currentver'] = '0.1.17';
+ return $GLOBALS['setup_info']['controller']['currentver'];
+ }
\ No newline at end of file
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-01-06 19:53:59 UTC (rev 8512)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-01-07 10:38:09 UTC (rev 8513)
@@ -28,26 +28,6 @@
dateFormat: 'dd/mm-yy'
});
- $(".tab_menu a").click(function(){
- var thisTabA = $(this);
- var thisTabMenu = $(this).parent(".tab_menu");
-
- var showId = $(thisTabA).attr("href");
- var hideId =
$(thisTabMenu).find("a.active").attr("href");
-
- $(thisTabMenu).find("a").removeClass("active");
- $(thisTabA).addClass('active');
-
- $(hideId).hide();
- $(hideId).removeClass("active")
- $(showId).fadeIn('10', function(){
- $(showId).addClass('active');
-
- });
-
- return false;
- });
-
$("#register_errors").live("click", function(){
var requestUrl = $(this).attr("href");
load_tab(requestUrl);
@@ -187,6 +167,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_errors</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
</a>
Modified: trunk/controller/templates/base/check_list/view_closed_errors.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_closed_errors.xsl
2012-01-06 19:53:59 UTC (rev 8512)
+++ trunk/controller/templates/base/check_list/view_closed_errors.xsl
2012-01-07 10:38:09 UTC (rev 8513)
@@ -8,6 +8,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.register_errors</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Registrer sak/måling
</a>
@@ -29,6 +30,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_errors</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Vis åpne saker
</a>
@@ -37,6 +39,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_closed_errors</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Vis lukkede saker
</a>
@@ -45,12 +48,13 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_measurements</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Vis målinger
</a>
</div>
- <div id="view_handled_errors" class="tab_item">
+ <div class="tab_item">
<xsl:choose>
<xsl:when test="handled_check_items/child::node()">
@@ -61,7 +65,7 @@
<xsl:if test="status =
1">
<li>
<h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="control_item/title"/></span></h4>
- <form
class="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
+ <form
id="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
<input
type="hidden" name="check_item_id" value="{$check_item_id}" />
<div
class="check_item">
Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl
2012-01-06 19:53:59 UTC (rev 8512)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl
2012-01-07 10:38:09 UTC (rev 8513)
@@ -111,6 +111,7 @@
<xsl:text>index.php?menuaction=controller.uiprocedure.view_procedures_for_control</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Prosedyrer
</a>
Modified: trunk/controller/templates/base/check_list/view_measurements.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_measurements.xsl
2012-01-06 19:53:59 UTC (rev 8512)
+++ trunk/controller/templates/base/check_list/view_measurements.xsl
2012-01-07 10:38:09 UTC (rev 8513)
@@ -29,6 +29,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_errors</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Vis åpne saker
</a>
@@ -45,12 +46,13 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_measurements</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Vis målinger
</a>
</div>
- <div id="view_measurements" class="tab_item">
+ <div class="tab_item">
<xsl:choose>
<xsl:when test="measurement_check_items/child::node()">
Modified: trunk/controller/templates/base/check_list/view_open_errors.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_errors.xsl
2012-01-06 19:53:59 UTC (rev 8512)
+++ trunk/controller/templates/base/check_list/view_open_errors.xsl
2012-01-07 10:38:09 UTC (rev 8513)
@@ -29,6 +29,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_errors</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Vis åpne saker
</a>
@@ -45,12 +46,13 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_measurements</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Vis målinger
</a>
</div>
- <div id="view_open_errors" class="tab_item active">
+ <div class="tab_item active">
<xsl:choose>
<xsl:when test="open_check_items/child::node()">
@@ -61,7 +63,7 @@
<li>
<xsl:if test="status =
0">
<h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="control_item/title"/></span></h4>
- <form
class="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
+ <form
id="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
<input
type="hidden" name="check_item_id" value="{$check_item_id}" />
<div
class="check_item">
Modified:
trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
===================================================================
--- trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-01-06 19:53:59 UTC (rev 8512)
+++ trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-01-07 10:38:09 UTC (rev 8513)
@@ -9,6 +9,7 @@
<xsl:text>index.php?menuaction=controller.uiprocedure.print_procedure</xsl:text>
<xsl:text>&procedure_id=</xsl:text>
<xsl:value-of select="control_procedure/id"/>
+ <xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Skriv ut
</a>
@@ -26,6 +27,7 @@
<xsl:text>index.php?menuaction=controller.uiprocedure.print_procedure</xsl:text>
<xsl:text>&procedure_id=</xsl:text>
<xsl:value-of
select="procedure/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Skriv ut
</a>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8513],
Torstein <=