[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8926]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8926] |
|
Date: |
Mon, 20 Feb 2012 07:06:54 +0000 |
Revision: 8926
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8926
Author: vator
Date: 2012-02-20 07:06:52 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socontrol_group_list.inc.php
trunk/controller/inc/class.socontrol_item_list.inc.php
trunk/controller/inc/class.uicontrol.inc.php
trunk/controller/inc/class.uicontrol_group.inc.php
trunk/controller/inc/component/class.calendar_builder.inc.php
trunk/controller/inc/component/class.date_generator.inc.php
trunk/controller/js/controller/ajax.js
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/control_item/sort_check_list.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.socontrol_group_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group_list.inc.php 2012-02-17
15:11:45 UTC (rev 8925)
+++ trunk/controller/inc/class.socontrol_group_list.inc.php 2012-02-20
07:06:52 UTC (rev 8926)
@@ -133,7 +133,7 @@
}
}
- function get_single_2($control_id, $control_group_id)
+ function get_group_list_by_control_and_group($control_id,
$control_group_id)
{
$sql = "SELECT p.* FROM controller_control_group_list p
WHERE p.control_id=" . $control_id . " AND p.control_group_id=" .
$control_group_id;
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
Modified: trunk/controller/inc/class.socontrol_item_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item_list.inc.php 2012-02-17
15:11:45 UTC (rev 8925)
+++ trunk/controller/inc/class.socontrol_item_list.inc.php 2012-02-20
07:06:52 UTC (rev 8926)
@@ -218,13 +218,15 @@
return $results;
}
+ // Deletes control list item defines by control id and control
item id
function delete($control_id, $control_item_id)
{
$result = $this->db->query("DELETE FROM
controller_control_item_list WHERE control_id = $control_id AND control_item_id
= $control_item_id", __LINE__,__FILE__);
return isset($result);
}
-
+
+ // Deletes all control items that a control has
function delete_control_items($control_id)
{
$result = $this->db->query("DELETE FROM
controller_control_item_list WHERE control_id = $control_id");
@@ -232,6 +234,20 @@
return isset($result);
}
+ // Deletes all control items that a control has
+ function delete_control_items_for_group_list($control_id,
$control_group_id)
+ {
+ $sql = "DELETE FROM controller_control_item_list ";
+ $sql .= "USING controller_control_item ";
+ $sql .= "WHERE control_id = $control_id ";
+ $sql .= "AND control_item_id =
controller_control_item.id ";
+ $sql .= "AND controller_control_item.control_group_id =
$control_group_id";
+
+ $result = $this->db->query($sql);
+
+ return isset($result);
+ }
+
function get_id_field_name($extended_info = false){}
protected function get_query(string $sort_field, boolean
$ascending, string $search_for, string $search_type, array $filters, boolean
$return_count){}
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2012-02-17 15:11:45 UTC
(rev 8925)
+++ trunk/controller/inc/class.uicontrol.inc.php 2012-02-20 07:06:52 UTC
(rev 8926)
@@ -415,28 +415,58 @@
self::render_template_xsl(array('control/control_tabs',
'control_group/control_groups'), $data);
}
+ /**
+ * Public function for saving control groups. Saves
+ * the database and the virtual file system (vfs).
+ *
+ * @param HTTP::id the document id
+ * @return true if successful, false if error, permission
denied message on
+ * not enough privileges
+ */
public function save_control_groups(){
$control_id = phpgw::get_var('control_id');
$control_group_ids =
phpgw::get_var('control_group_ids');
+ // Fetches saved control groups
+ $saved_control_groups =
$this->so_control_group_list->get_control_groups_by_control($control_id);
+
+ // Deletes groups from control that's not among the
chosen groups
+ foreach($saved_control_groups as $group)
+ {
+ // If saved group id not among chosen control
ids, delete the group for the control
+ if( !in_array($group->get_id(),
$saved_control_groups) ){
+
$this->so_control_group_list->delete($control_id, $group->get_id());
+
+ // Deletes control items for
group
+
$this->so_control_item_list->delete_control_items_for_group_list($control_id,
$group->get_id());
+ }
+ }
+
+ /*
// Deleting earlier saved control groups
$this->so_control_group_list->delete_control_groups($control_id);
// Deleting earlier saved control items
$this->so_control_item_list->delete_control_items($control_id);
+ */
$group_order_nr = 1;
// Saving control groups
foreach ($control_group_ids as $control_group_id)
{
- $control_group_list = new
controller_control_group_list();
-
$control_group_list->set_control_id($control_id);
-
$control_group_list->set_control_group_id($control_group_id);
-
$control_group_list->set_order_nr($group_order_nr);
+ $control_group =
$this->so_control_group_list->get_group_list_by_control_and_group($control_id,
$control_group_id);
+
+ if($control_group == null)
+ {
+ $control_group_list = new
controller_control_group_list();
+
$control_group_list->set_control_id($control_id);
+
$control_group_list->set_control_group_id($control_group_id);
+
$control_group_list->set_order_nr($group_order_nr);
-
$this->so_control_group_list->add($control_group_list);
- $group_order_nr++;
+
$this->so_control_group_list->add($control_group_list);
+ $group_order_nr++;
+ }
}
// Redirect: view_control_items
Modified: trunk/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group.inc.php 2012-02-17 15:11:45 UTC
(rev 8925)
+++ trunk/controller/inc/class.uicontrol_group.inc.php 2012-02-20 07:06:52 UTC
(rev 8926)
@@ -537,7 +537,7 @@
$status = true;
- $control_group_list =
$this->so_control_group_list->get_single_2($control_id, $control_group_id);
+ $control_group_list =
$this->so_control_group_list->get_group_list_by_control_and_group($control_id,
$control_group_id);
if( $control_group_list == null ){
$control_group_list = new
controller_control_group_list();
Modified: trunk/controller/inc/component/class.calendar_builder.inc.php
===================================================================
--- trunk/controller/inc/component/class.calendar_builder.inc.php
2012-02-17 15:11:45 UTC (rev 8925)
+++ trunk/controller/inc/component/class.calendar_builder.inc.php
2012-02-20 07:06:52 UTC (rev 8926)
@@ -4,6 +4,10 @@
include_class('controller', 'check_list_status_info', 'inc/helper/');
include_class('controller', 'check_list_status_manager', 'inc/helper/');
+/* This class transforms controls with checklists or controls with aggregated
values for number of open cases,
+* and puts these values in a calendar array for each control
+*/
+
class calendar_builder {
private $period_start_date;
Modified: trunk/controller/inc/component/class.date_generator.inc.php
===================================================================
--- trunk/controller/inc/component/class.date_generator.inc.php 2012-02-17
15:11:45 UTC (rev 8925)
+++ trunk/controller/inc/component/class.date_generator.inc.php 2012-02-20
07:06:52 UTC (rev 8926)
@@ -1,5 +1,9 @@
<?php
-
+
+/* This class generates dates based on start date, end date,
+ * repeat type(day, week, month, year) and repeat interval
+ */
+
class date_generator
{
private $start_date;
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2012-02-17 15:11:45 UTC (rev
8925)
+++ trunk/controller/js/controller/ajax.js 2012-02-20 07:06:52 UTC (rev
8926)
@@ -434,25 +434,22 @@
// Show info box with info about check list
var infoBox = $(divWrp).find("#info_box");
$(infoBox).show();
- $(infoBox).html("");
- $(infoBox).html("<h5>Åpne saker</h5>");
-
- var htmlList = "<ul>";
+ var htmlStr = "<h5>Åpne saker</h5><ul>";
$.each(obj, function(i) {
- htmlList += "<li><label>" +
(parseInt(i) + 1) + ": Tittel</label><span>" + obj[i].control_item.title +
"</span>";
- htmlList += "<ul>";
+ htmlStr += "<li><label>" +
(parseInt(i) + 1) + ": Tittel</label><span>" + obj[i].control_item.title +
"</span>";
+ htmlStr += "<ul>";
$(obj[i].cases_array).each(function(j) {
- htmlList += "<li>" + "Sak " +
(parseInt(j) + 1) + ": " + obj[i].cases_array[j].descr + "</li>";
+ htmlStr += "<li>" + "Sak " +
(parseInt(j) + 1) + ": " + obj[i].cases_array[j].descr + "</li>";
});
- htmlList += "</li></ul>";
+ htmlStr += "</ul></li>";
});
- htmlList += "</ul>";
+ htmlStr += "</ul>";
- $(infoBox).append( htmlList );
+ $(infoBox).html( htmlStr );
}
}
});
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-02-17 15:11:45 UTC (rev 8925)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-02-20 07:06:52 UTC (rev 8926)
@@ -141,7 +141,7 @@
<ul id="days_view" class="calendar days">
<li class="heading">
<xsl:for-each
select="heading_array">
- <div><xsl:value-of
select="."/></div>
+ <div
class="cell"><xsl:value-of select="."/></div>
</xsl:for-each>
</li>
<xsl:choose>
@@ -151,7 +151,7 @@
<xsl:for-each
select="calendar_array">
<xsl:choose>
<xsl:when test="status = 'control_registered'">
-
<div>
+
<div class="cell">
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
@@ -167,7 +167,7 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_planned'">
-
<div>
+
<div class="cell">
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -179,7 +179,7 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
-
<div>
+
<div class="cell">
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -192,8 +192,8 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></div>
+
<div class="cell" style="position:relative;">
+
<div id="info_box"></div>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -206,8 +206,8 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_accomplished_with_errors'">
-
<div style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
-
<div id="info_box"
style="position:absolute;display:none;"></div>
+
<div class="cell" style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
+
<div id="info_box"></div>
<a class="view_check_list">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -223,8 +223,8 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_not_accomplished_with_info'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></div>
+
<div class="cell" style="position:relative;">
+
<div id="info_box"></div>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -237,7 +237,7 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_not_accomplished'">
-
<div>
+
<div class="cell">
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
@@ -253,12 +253,12 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_canceled'">
-
<div>
+
<div class="cell">
<img height="15"
src="controller/images/status_icon_red_cross.png" />
</div>
</xsl:when>
<xsl:otherwise>
-
<div></div>
+
<div class="cell"></div>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
Modified: trunk/controller/templates/base/control_item/sort_check_list.xsl
===================================================================
--- trunk/controller/templates/base/control_item/sort_check_list.xsl
2012-02-17 15:11:45 UTC (rev 8925)
+++ trunk/controller/templates/base/control_item/sort_check_list.xsl
2012-02-20 07:06:52 UTC (rev 8926)
@@ -37,6 +37,7 @@
<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>
@@ -47,6 +48,7 @@
</xsl:attribute>
<span>x</span>
</a>
+
-->
</li>
</xsl:for-each>
</ul>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-02-17 15:11:45 UTC
(rev 8925)
+++ trunk/controller/templates/base/css/base.css 2012-02-20 07:06:52 UTC
(rev 8926)
@@ -816,9 +816,9 @@
}
#control_plan .col_2 {
- float:right;
- width:300px;
- margin-top:40px;
+ float: right;
+ margin-top: 40px;
+ width: 330px;
}
ul.calendar li{
@@ -867,7 +867,7 @@
position: relative;
width: 37%;
}
-ul.calendar.days li div {
+ul.calendar.days li div.cell {
height: 17px;
width: 24px;
}
@@ -924,6 +924,8 @@
width: 350px;
z-index: 1;
font-size:12px;
+ position:absolute;
+ display:none;
}
#info_box label{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8926],
Torstein <=