[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7995]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [7995] |
|
Date: |
Thu, 03 Nov 2011 06:32:50 +0000 |
Revision: 7995
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7995
Author: vator
Date: 2011-11-03 06:32:48 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/class.socontrol.inc.php
trunk/controller/inc/class.socontrol_group_list.inc.php
trunk/controller/inc/class.socontrol_item_list.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicontrol_group.inc.php
trunk/controller/inc/model/class.control.inc.php
trunk/controller/js/controller/custom_drag_drop.js
trunk/controller/templates/base/control_check_lists.xsl
trunk/controller/templates/base/control_group_items.xsl
trunk/controller/templates/base/control_groups.xsl
trunk/controller/templates/base/control_item.xsl
trunk/controller/templates/base/control_items.xsl
trunk/controller/templates/base/control_tabs.xsl
trunk/controller/templates/base/css/base.css
trunk/controller/templates/base/view_check_list.xsl
Added Paths:
-----------
trunk/controller/templates/base/app_data.xsl
Removed Paths:
-------------
trunk/controller/templates/base/app_data.xsl
trunk/controller/templates/base/check_lists.xsl
trunk/controller/templates/base/control_check_list.xsl
trunk/controller/templates/base/control_items_receipt.xsl
trunk/controller/templates/base/controller_check_lists.xsl
trunk/controller/templates/base/example_edit.xsl
trunk/controller/templates/base/example_normal_tabs.xsl
trunk/controller/templates/base/example_separate_tabs.xsl
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/inc/class.socheck_list.inc.php 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -1,7 +1,7 @@
<?php
phpgw::import_class('controller.socommon');
-//include_class('controller', 'control_group_list', 'inc/model/');
+include_class('controller', 'control', 'inc/model/');
class controller_socheck_list extends controller_socommon
{
@@ -33,14 +33,46 @@
while ($this->db->next_record()) {
$start_date = date("d.m.Y",
$this->db->f('start_date'));
+ $end_date = date("d.m.Y", $this->db->f('end_date'));
- $result[] = array(
- 'title' =>
$this->db->f('title'),
- 'start_date' =>
$start_date
- );
+ $control = new
controller_control($this->unmarshal($this->db->f('id', true), 'int'));
+
+
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
+
$control->set_description($this->unmarshal($this->db->f('description', true),
'boolean'));
+ $control->set_start_date($start_date);
+ $control->set_end_date($end_date);
+
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id', true),
'int'));
+
$control->set_procedure_name($this->unmarshal($this->db->f('procedure_name',
true), 'string'));
+
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
+
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
+
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
+
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
+
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
+
$control->set_equipment_type_id($this->unmarshal($this->db->f('equipment_type_id',
true), 'int'));
+
$control->set_equipment_id($this->unmarshal($this->db->f('equipment_id', true),
'int'));
+
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'int'));
+
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
+
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
+
+ $results[] = $control->toArray();
}
+
+ return $results;
+ }
- return $result;
+ function get_check_lists_for_control($control_id){
+
+ $sql = "SELECT ci.*, cil.order_nr FROM controller_control_item
ci, controller_control_item_list cil WHERE cil.control_id = $control_id AND
cil.control_item_id = ci.id ORDER BY cil.order_nr;";
+ $this->db->query($sql, 0, __LINE__, __FILE__);
+ $this->db->next_record();
+
+ $control_item_list = new
controller_control_item_list($this->unmarshal($this->db->f('id', true), 'int'));
+
$control_item_list->set_control_id($this->unmarshal($this->db->f('control_id',
true), 'int'));
+
$control_item_list->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+
$control_item_list->set_order_nr($this->unmarshal($this->db->f('order_nr',
true), 'int'));
+
+ return $control_item_list;
+
}
function get_query(string $sort_field, boolean $ascending, string
$search_for, string $search_type, array $filters, boolean $return_count){}
Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/inc/class.socontrol.inc.php 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -84,18 +84,8 @@
//return isset($result);
}
+ function get_procedure_list(){}
-
-
-
-
-
- function get_procedure_list(){
-
-
- }
-
-
function get_id_field_name($extended_info = false)
{
if(!$extended_info)
@@ -253,20 +243,7 @@
return $control;
}
-/* public function populate($control){
-
- $control->set_title(phpgw::get_var('title', 'string'));
- $control->set_description(phpgw::get_var('description',
'string'));
- $control->set_start_date( strtotime(
phpgw::get_var('start_date_hidden', 'int')));
- $control->set_end_date( strtotime(
phpgw::get_var('end_date_hidden', 'int')));
- $control->set_repeat_type(
phpgw::get_var('repeat_type', 'string'));
- $control->set_repeat_interval(
phpgw::get_var('repeat_interval', 'string'));
- $control->set_procedure_id(
phpgw::get_var('procedure_id', 'int'));
- $control->set_enabled( true );
-
- return $control;
-
- }*/
+
}
Modified: trunk/controller/inc/class.socontrol_group_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group_list.inc.php 2011-11-03
06:25:34 UTC (rev 7994)
+++ trunk/controller/inc/class.socontrol_group_list.inc.php 2011-11-03
06:32:48 UTC (rev 7995)
@@ -2,6 +2,7 @@
phpgw::import_class('controller.socommon');
include_class('controller', 'control_group_list', 'inc/model/');
+include_class('controller', 'control_group', 'inc/model/');
class controller_socontrol_group_list extends controller_socommon
{
@@ -122,6 +123,27 @@
}
}
+ function get_control_groups_by_control_id($control_id)
+ {
+ $this->db->query("SELECT cg.*, cgl.order_nr FROM
controller_control_group_list cgl, controller_control_group cg WHERE
cgl.control_id=$control_id AND cgl.control_group_id=cg.id ORDER BY
cgl.order_nr", __LINE__, __FILE__);
+
+ $control_group_list = array();
+
+ while($this->db->next_record()){
+
+ $control_group = new
controller_control_group($this->unmarshal($this->db->f('id', true), 'int'));
+
$control_group->set_group_name($this->unmarshal($this->db->f('group_name',
true), 'string'));
+
$control_group->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
+
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'int'));
+
+ $control_group_list[] = $control_group;
+ }
+
+ return $control_group_list;
+ }
+
+
protected function get_query(string $sort_field, boolean $ascending,
string $search_for, string $search_type, array $filters, boolean
$return_count){}
function get_id_field_name($extended_info = false){}
Modified: trunk/controller/inc/class.socontrol_item_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item_list.inc.php 2011-11-03
06:25:34 UTC (rev 7994)
+++ trunk/controller/inc/class.socontrol_item_list.inc.php 2011-11-03
06:32:48 UTC (rev 7995)
@@ -106,7 +106,7 @@
function get_single_2($control_id, $control_item_id)
{
- $sql = "SELECT p.* FROM controller_control_item_list p WHERE
p.control_id = " . $control_id . " AND p.control_item_id = " . $control_item_id;
+ $sql = "SELECT cil.* FROM controller_control_item_list cil
WHERE cil.control_id = " . $control_id . " AND cil.control_item_id = " .
$control_item_id;
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
$this->db->next_record();
@@ -139,162 +139,26 @@
*/
function get_control_item_array($start = 0, $results = 1000, $sort =
null, $dir = '', $query = null, $search_option = null, $filters = array())
{
- /*
- $results = array();
-
- //$condition = $this->get_conditions($query,
$filters,$search_option);
- $order = $sort ? "ORDER BY $sort $dir ": '';
-
- //$sql = "SELECT * FROM controller_procedure WHERE $condition
$order";
- $sql = "SELECT * FROM controller_control_item $order";
- $this->db->limit_query($sql, $start, __LINE__, __FILE__,
$limit);
-
- while ($this->db->next_record()) {
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
-
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
-
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
-
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
-
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
-
- $results[] = $control_item;
- }
-
- return $results;
-
- */
}
function get_id_field_name($extended_info = false)
{
- /*
- if(!$extended_info)
- {
- $ret = 'id';
- }
- else
- {
- $ret = array
- (
- 'table' => 'controller', //
alias
- 'field' => 'id',
- 'translated' => 'id'
- );
- }
-
- return $ret;
- */
}
protected function get_query(string $sort_field, boolean $ascending,
string $search_for, string $search_type, array $filters, boolean $return_count)
{
- /*
- $clauses = array('1=1');
- $filter_clauses = array();
-
- // Search for based on search type
- if($search_for)
- {
- $search_for = $this->marshal($search_for,'field');
- $like_pattern = "'%".$search_for."%'";
- $like_clauses = array();
- switch($search_type){
- default:
- $like_clauses[] =
"controller_control_item.title $this->like $like_pattern";
- $like_clauses[] =
"controller_control_item.what_to_do $this->like $like_pattern";
- $like_clauses[] =
"controller_control_item.how_to_do $this->like $like_pattern";
- break;
- }
-
- if(count($like_clauses))
- {
- $clauses[] = '(' . join(' OR ', $like_clauses)
. ')';
- }
- }
-
- if(isset($filters[$this->get_id_field_name()]))
- {
- $filter_clauses[] = "controller_control_item.id =
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
- }
-
- if(count($filter_clauses))
- {
- $clauses[] = join(' AND ', $filter_clauses);
- }
-
-
- $condition = join(' AND ', $clauses);
-
- $tables = "controller_control_item";
- //$joins = " {$this->left_join} rental_document_types ON
(rental_document.type_id = rental_document_types.id)";
-
- if($return_count)
- {
- $cols = 'COUNT(DISTINCT(controller_control_item.id)) AS
count';
- }
- else
- {
- $cols = 'id, title, required, what_to_do, how_to_do,
control_group_id, control_area_id';
- }
-
- $dir = $ascending ? 'ASC' : 'DESC';
- if($sort_field == 'title')
- {
- $sort_field = 'controller_control_item.title';
- }
- $order = $sort_field ? "ORDER BY {$this->marshal($sort_field,
'field')} $dir ": '';
-
- //return "SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}";
-
- return "SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}";
-
- */
}
function get_control_items($control_group_id)
{
- /*
- $results = array();
- $sql = "SELECT * FROM controller_control_item WHERE
control_group_id=$control_group_id";
- $this->db->limit_query($sql, $start, __LINE__, __FILE__,
$limit);
-
- while ($this->db->next_record()) {
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
-
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
-
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
-
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
-
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
-
- $results[] = $control_item;
- }
-
- return $results;
-
- */
}
function populate(int $control_item_id, &$control_item)
{
- /*
- if($control_item == null) {
- $control_item = new controller_control_item((int)
$control_item_id);
-
-
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
-
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
-
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
-
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
- }
- return $control_item;
- */
}
}
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -5,22 +5,30 @@
class controller_uicheck_list extends controller_uicommon
{
private $so;
+ private $socontrol_group;
+ private $socontrol_group_list;
+ private $socontrol_item;
public $public_functions = array
(
- 'index' => true
+ 'index' => true,
+ 'view_check_list_for_control' => true
);
public function __construct()
{
parent::__construct();
+
$this->so = CreateObject('controller.socheck_list');
+ $this->socontrol_group =
CreateObject('controller.socontrol_group');
+ $this->socontrol_group_list =
CreateObject('controller.socontrol_group_list');
+ $this->socontrol_item =
CreateObject('controller.socontrol_item');
+
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
"controller::check_list";
}
public function index()
{
-
$check_list_array = $this->so->get_check_list();
$data = array
@@ -28,9 +36,36 @@
'check_list_array' => $check_list_array
);
-
self::render_template_xsl('control_check_lists', $data);
}
+ public function view_check_list_for_control()
+ {
+ $control_id = phpgw::get_var('control_id');
+ $control = $this->so->get_single($control_id);
+
+ $control_groups_array =
$this->socontrol_group_list->get_control_groups_by_control_id( $control_id );
+
+ $saved_groups_with_items_array = array();
+
+ foreach ($control_groups_array as $control_group)
+ {
+ $control_group_id = $control_group->get_id();
+ $saved_control_items =
$this->socontrol_item->get_control_items_by_control_id_and_group($control_id,
$control_group_id);
+
+ $saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
+ }
+
+ $data = array
+ (
+ 'control_id'
=> $control_id,
+ 'saved_groups_with_items_array' =>
$saved_groups_with_items_array
+ );
+
+ //print_r($saved_groups_with_items_array);
+
+ self::render_template_xsl('view_check_list', $data);
+ }
+
public function query(){}
}
Modified: trunk/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group.inc.php 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/inc/class.uicontrol_group.inc.php 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -50,11 +50,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('New control group'),
- 'href' =>
self::link(array('menuaction' => 'controller.uicontrol_group.add'))
- ),
array('type' =>
'filter',
'name' =>
'status',
'text' => lang('Status').':',
@@ -100,6 +95,11 @@
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
),
+ array(
+ 'type' =>
'link',
+ 'value' =>
lang('New control group'),
+ 'href' =>
self::link(array('menuaction' => 'controller.uicontrol_group.add'))
+ ),
),
),
),
Modified: trunk/controller/inc/model/class.control.inc.php
===================================================================
--- trunk/controller/inc/model/class.control.inc.php 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/inc/model/class.control.inc.php 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -24,14 +24,6 @@
protected $control_area_id;
protected $control_area_name;
- /*
- var $validate = array(
- 'title' => array(
- 'rule' => array('minLength', 0),
- 'message' => 'Kontrollen må ha en tittel'
- ));
- */
-
/**
* Constructor. Takes an optional ID. If a contract is
created from outside
* the database the ID should be empty so the database can add
one according to its logic.
Modified: trunk/controller/js/controller/custom_drag_drop.js
===================================================================
--- trunk/controller/js/controller/custom_drag_drop.js 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/js/controller/custom_drag_drop.js 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -27,6 +27,27 @@
start_drag();
});
+ // Drag row is clicked
+ $(".drag_group h3").mousedown(function(e){
+ placeholder = $(this).parent();
+
+ adj_y = e.pageY - $(placeholder).position().top;
+
+ next_elem = $(placeholder).next();
+ prev_elem = $(placeholder).prev();
+ drag_elem = $(placeholder).clone();
+
+ $(drag_elem).addClass("drag_elem");
+ $(drag_elem).removeClass("list_item");
+
+ $(drag_elem).insertAfter(placeholder);
+
+ $(drag_elem).css("left", $(placeholder).position().left + "px");
+ $(drag_elem).css("top", $(placeholder).position().top + "px");
+
+ start_drag_group();
+ });
+
// Delete a control item list
$(".delete").click(function(){
var clickElem = $(this);
@@ -89,6 +110,42 @@
});
}
+function start_drag_group(){
+ $(document).bind("mouseup", stop_drag_group);
+
+ $(document).bind("mousemove", function(e){
+
+ var x = 0;
+ var y = e.pageY - adj_y;
+
+ $(drag_elem).css("left", x + "px");
+ $(drag_elem).css("top", y + "px");
+
+ // Move drag element over next element
+ if( $(next_elem).length > 0 && e.pageY >
$(next_elem).offset().top ){
+ $(placeholder).insertAfter(next_elem);
+ next_elem = $(placeholder).next();
+ prev_elem = $(placeholder).prev();
+
+ // Updating order number for drag element and previous
element
+ update_group_order_nr(placeholder, "+");
+ update_group_order_nr(prev_elem, "-");
+ }
+ // Move drag element over previous element
+ else if( $(prev_elem).length > 0 && e.pageY <
$(prev_elem).offset().top + $(prev_elem).height()/2 ){
+ $(placeholder).insertBefore(prev_elem);
+ prev_elem = $(placeholder).prev();
+ next_elem = $(placeholder).next();
+
+ // Updating order number for drag element and next
element
+ update_group_order_nr(placeholder, "-");
+ update_group_order_nr(next_elem, "+");
+ }
+ });
+}
+
+
+
// Release binding for mouse events
function stop_drag(){
$(drag_elem).remove();
@@ -97,6 +154,31 @@
$(document).unbind("mouseup");
}
+//Release binding for mouse events
+function stop_drag_group(){
+ $(drag_elem).remove();
+
+ $('li.drag_group').each(function() {
+ var group_order_nr = $(this).find("span.group_order_nr").text();
+ var control_group_id =
$(this).find("input[name='control_group_id']").val();
+ var control_id = $("#control_id").val();
+
+ var requestUrl =
"index.php?menuaction=controller.uicontrol_group.save_group_order";
+
+ $.ajax({
+ type: 'POST',
+ url: requestUrl + "&control_id=" + control_id +
"&control_group_id=" + control_group_id + "&group_order_nr=" + group_order_nr,
+ success: function() {
+
+ }
+ });
+
+ });
+
+ $(document).unbind("mousemove");
+ $(document).unbind("mouseup");
+}
+
// Updates order number for hidden field and number in front of row
function update_order_nr(element, sign){
var hidden_order_nr = $(element).find("input");
@@ -119,4 +201,18 @@
// Updating order number in front of row
$(span_order_nr).text(updated_order_nr);
+}
+
+//Updates order number for hidden field and number in front of row
+function update_group_order_nr(element, sign){
+ var span_order_nr = $(element).find("span.group_order_nr");
+ var order_nr = $(span_order_nr).text();
+
+ if(sign == "+")
+ var updated_order_nr = parseInt(order_nr) + 1;
+ else
+ var updated_order_nr = parseInt(order_nr) - 1;
+
+ // Updating order number in front of row
+ $(span_order_nr).text(updated_order_nr);
}
\ No newline at end of file
Deleted: trunk/controller/templates/base/app_data.xsl
===================================================================
--- trunk/controller/templates/base/app_data.xsl 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/templates/base/app_data.xsl 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -1,3 +0,0 @@
- <xsl:template name="dummy">
- </xsl:template>
-
Added: trunk/controller/templates/base/app_data.xsl
===================================================================
--- trunk/controller/templates/base/app_data.xsl
(rev 0)
+++ trunk/controller/templates/base/app_data.xsl 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -0,0 +1,3 @@
+ <xsl:template name="dummy">
+ </xsl:template>
+
Property changes on: trunk/controller/templates/base/app_data.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/controller/templates/base/check_lists.xsl
===================================================================
--- trunk/controller/templates/base/check_lists.xsl 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/templates/base/check_lists.xsl 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -1,9 +0,0 @@
-<xsl:template name="check_lists" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content tab_content">
-
- <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
-
-
-</div>
-</xsl:template>
\ No newline at end of file
Deleted: trunk/controller/templates/base/control_check_list.xsl
===================================================================
--- trunk/controller/templates/base/control_check_list.xsl 2011-11-03
06:25:34 UTC (rev 7994)
+++ trunk/controller/templates/base/control_check_list.xsl 2011-11-03
06:32:48 UTC (rev 7995)
@@ -1,59 +0,0 @@
-<xsl:template name="control_check_list" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content tab_content">
-
- <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
-
- <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
- <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
-
- <ul class="groups">
- <xsl:for-each select="saved_groups_with_items_array">
- <li class="drag_group list_item">
- <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
-
- <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
- <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
- <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
-
- <ul id="list">
- <xsl:for-each
select="control_items">
- <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
- <xsl:variable
name="order_tag">
-
<xsl:choose>
-
<xsl:when test="order_nr > 0">
-
<xsl:value-of select="order_nr"/>
-
</xsl:when>
-
<xsl:otherwise>
-
<xsl:number/>
-
</xsl:otherwise>
-
</xsl:choose>:<xsl:value-of select="id"/>
- </xsl:variable>
-
- <li class="list_item">
- <span
class="drag">
- <span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
- </span>
- <a
class="delete">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="//control_id"/>
-
<xsl:text>&control_item_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
-
<span>x</span>
- </a>
- </li>
- </xsl:for-each>
- </ul>
- <div>
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
- <input type="submit"
id="save_order" name="save_order" value="{$lang_save}" title = "{$lang_save}" />
- </div>
- </form>
- </li>
- </xsl:for-each>
- </ul>
-</div>
-</xsl:template>
\ No newline at end of file
Modified: trunk/controller/templates/base/control_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/control_check_lists.xsl 2011-11-03
06:25:34 UTC (rev 7994)
+++ trunk/controller/templates/base/control_check_lists.xsl 2011-11-03
06:32:48 UTC (rev 7995)
@@ -6,12 +6,26 @@
</div>
<div class="yui-content">
- <div id="details">
-
+ <div id="view_check_lists">
+
+ <ul
class="th"><li>Tittel</li><li>Startdato</li><li>Planlagtdato</li><li>Utførtdato</li></ul>
<ul class="check_list">
<xsl:for-each select="check_list_array">
<li>
- <span>Tittel:<xsl:value-of
select="title"/></span><span>Start dato:<xsl:value-of
select="start_date"/></span>
+ <ul class="row">
+ <li>
+ <a>
+ <xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list_for_control</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="id"/>
+ </xsl:attribute>
+
<span><xsl:value-of select="title"/></span>
+ </a>
+ </li>
+ <li><xsl:value-of
select="start_date"/></li>
+ <li><xsl:value-of
select="end_date"/></li>
+ </ul>
</li>
</xsl:for-each>
</ul>
Modified: trunk/controller/templates/base/control_group_items.xsl
===================================================================
--- trunk/controller/templates/base/control_group_items.xsl 2011-11-03
06:25:34 UTC (rev 7994)
+++ trunk/controller/templates/base/control_group_items.xsl 2011-11-03
06:32:48 UTC (rev 7995)
@@ -1,4 +1,4 @@
-<xsl:template name="control_items" xmlns:php="http://php.net/xsl";>
+<xsl:template name="control_group_items" xmlns:php="http://php.net/xsl";>
<xsl:call-template name="yui_booking_i18n"/>
<div class="identifier-header">
Modified: trunk/controller/templates/base/control_groups.xsl
===================================================================
--- trunk/controller/templates/base/control_groups.xsl 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/templates/base/control_groups.xsl 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -1,11 +1,11 @@
<xsl:template name="control_groups" xmlns:php="http://php.net/xsl";>
-<div class="yui-content">
+<div class="yui-content tab_content">
<div id="control_groups">
<h2><xsl:value-of select="control_area/title"/></h2>
- <form action="index.php?menuaction=controller.uicontrol.index"
method="post">
+ <form
action="index.php?menuaction=controller.uicontrol.view_control_items"
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}" />
Modified: trunk/controller/templates/base/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item.xsl 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/templates/base/control_item.xsl 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -9,6 +9,15 @@
</h1>
</div>
+<ul class="check_list">
+ <xsl:for-each select="check_list_array">
+ <li>
+
+ <span>Tittel:</span><xsl:value-of
select="title"/><span>Start dato:</span><xsl:value-of select="start_date"/>
+ </li>
+ </xsl:for-each>
+ </ul>
+
<div class="yui-content">
<div id="details">
<form action="#" method="post">
Modified: trunk/controller/templates/base/control_items.xsl
===================================================================
--- trunk/controller/templates/base/control_items.xsl 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/templates/base/control_items.xsl 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -1,18 +1,18 @@
<xsl:template name="control_items" xmlns:php="http://php.net/xsl";>
-<div class="yui-content">
+<div class="yui-content tab_content">
<div>
<!-- =========================== CHOOSE CONTROL ITEMS
=============================== -->
<h2>Velg dine kontrollpunkt</h2>
<h4 class="expand_header"><div class="expand_all">Vis
alle</div><div class="collapse_all">Skjul alle</div></h4>
- <form id="frm_control_items"
action="index.php?menuaction=controller.uicontrol.index" method="post">
+ <form id="frm_control_items"
action="index.php?menuaction=controller.uicontrol.save_control_items"
method="post">
<xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
<input type="hidden" name="control_id"
value="{control_id}" />
<xsl:variable name="control_group_ids"><xsl:value-of
select="control_group_ids"/></xsl:variable>
- <input type="hidden" name="control_group_ids[]"
value="{control_group_ids}" />
+ <input type="hidden" name="control_group_ids"
value="{control_group_ids}" />
<ul class="control_items">
<xsl:for-each
select="groups_with_control_items">
Deleted: trunk/controller/templates/base/control_items_receipt.xsl
===================================================================
--- trunk/controller/templates/base/control_items_receipt.xsl 2011-11-03
06:25:34 UTC (rev 7994)
+++ trunk/controller/templates/base/control_items_receipt.xsl 2011-11-03
06:32:48 UTC (rev 7995)
@@ -1,63 +0,0 @@
-<xsl:template name="control_items_receipt" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content">
- <div>
-
- <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
-
- <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
- <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
-
- <ul>
- <xsl:for-each select="control_receipt_items">
- <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
- <ul class="itemlist control_items">
- <li>
- <h3><xsl:value-of
select="control_group/group_name"/></h3>
-
- <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
- <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
-
- <ul id="list">
- <xsl:for-each
select="control_items">
- <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
- <xsl:variable
name="order_tag">
-
<xsl:choose>
-
<xsl:when test="order_nr > 0">
-
<xsl:value-of select="order_nr"/>
-
</xsl:when>
-
<xsl:otherwise>
-
<xsl:number/>
-
</xsl:otherwise>
-
</xsl:choose>:<xsl:value-of select="id"/>
- </xsl:variable>
-
- <li class="list_item">
- <span
class="drag">
- <span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
- </span>
- <a
class="delete">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="//control_id"/>
-
<xsl:text>&control_item_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
-
<span>x</span>
- </a>
- </li>
- </xsl:for-each>
- </ul>
- </li>
- </ul>
- <div>
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
- <input type="submit" id="save_order"
name="save_order" value="{$lang_save}" title = "{$lang_save}" />
- </div>
- </form>
- </xsl:for-each>
- </ul>
- </div>
-</div>
-</xsl:template>
\ No newline at end of file
Modified: trunk/controller/templates/base/control_tabs.xsl
===================================================================
--- trunk/controller/templates/base/control_tabs.xsl 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/templates/base/control_tabs.xsl 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -39,12 +39,12 @@
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
<xsl:call-template name="control_items" />
</xsl:when>
- <xsl:when test="view = 'receipt'">
+ <xsl:when test="view = 'check_list'">
<div class="identifier-header">
- <h1><xsl:value-of select="php:function('lang',
'Receipt')"/></h1>
+ <h1><xsl:value-of select="php:function('lang',
'Check_list')"/></h1>
</div>
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
- <xsl:call-template name="control_items_receipt" />
+ <xsl:call-template name="sort_check_list" />
</xsl:when>
</xsl:choose>
</div>
Deleted: trunk/controller/templates/base/controller_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/controller_check_lists.xsl 2011-11-03
06:25:34 UTC (rev 7994)
+++ trunk/controller/templates/base/controller_check_lists.xsl 2011-11-03
06:32:48 UTC (rev 7995)
@@ -1,16 +0,0 @@
-<xsl:template name="heck_lists" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content tab_content">
-
- <!-- =========================== SHOWS CHECK LIST
=============================== -->
-<h3>dsfdsfdsfdsfdsfds</h3>
- <ul class="check_list">
- <xsl:for-each select="check_list_array">
- <li>
-
- <span>Tittel:</span><xsl:value-of
select="title"/><span>Start dato:</span><xsl:value-of select="start_date"/>
- </li>
- </xsl:for-each>
- </ul>
-</div>
-</xsl:template>
\ No newline at end of file
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/templates/base/css/base.css 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -196,7 +196,7 @@
background-color: #eee;
border: 1px solid #bbb;
margin-bottom: 0em;
- padding: .3em;
+ padding: 10px 30px;
}
#datatableToolbar {
@@ -491,13 +491,9 @@
padding-left: 5px;
vertical-align: middle;
}
-#play ul li{
- cursor: move;
- width:600px;
-}
.yui-content input[type="submit"] {
- margin: 0 0 15px 15px;
+ margin: 15px 0 0;
padding: 1px 15px;
}
h1 img{
@@ -513,8 +509,7 @@
}
ul.itemlist {
- margin: 1em 0;
- padding-left: 20px;
+ position: relative;
}
ul.itemlist li {
padding: 3px 0;
@@ -529,9 +524,28 @@
margin: 0 0 5px;
}
+ul.groups {
+ position: relative;
+}
+ul.groups li {
+ padding: 3px 0;
+}
+
+ul.groups li.odd{
+ background: none repeat scroll 0 0 #DBE7F5;
+}
+
+ul.groups h3 {
+ font-size: 18px;
+ margin: 0 0 5px;
+}
+
+.drag_group {
+ width: 650px;
+}
+
.yui-content h2{
- margin: 1em 0;
- padding-left: 20px;
+ margin:0 0 10px;
}
#frm_control_items{
@@ -567,8 +581,8 @@
}
dl.proplist, dl.proplist-col {
- margin: 5px 0;
- padding-left: 15px;
+ margin: 0;
+ padding-left: 0;
}
.drag_elem{
@@ -592,15 +606,83 @@
left: 0px;
}
-.list_item:hover{
+.list_item:hover, .drag_group:hover{
cursor: move;
}
.frm_save_order input[type='submit']{
- margin: 0 0 15px 15px;
+ margin: 10px 0 15px 0;
width: 120px;
-}
+}
.delete {
cursor: pointer;
margin-left: 5px;
-}
\ No newline at end of file
+}
+.yui-navset .yui-content.tab_content {
+ padding: 20px;
+}
+
+#datatable-container {
+ margin: 20px;
+}
+
+#paginator {
+ margin: 20px;
+}
+
+#paginator.top {
+ margin: 20px 0 0 20px;
+}
+
+.yui-skin-sam .yui-button button, .yui-skin-sam .yui-button a, .yui-skin-sam
.yui-button a:visited {
+ height: 24px;
+}
+
+#toolbar {
+ padding: 10px 20px;
+}
+
+#innertoolbar-button{
+ /*background: none repeat scroll 0 0 #CCCCCC;*/
+ color: #111111;
+}
+
+.yui-button.yui-link-button.new_button{
+ margin-left:30px;
+}
+
+#view_check_lists {
+ padding: 30px;
+ width: 600px;
+}
+
+ul.th {
+ font-weight: bold;
+ overflow:hidden;
+}
+
+ul.th li {
+ float: left;
+ margin-right: 20px;
+ padding: 3px 6px;
+ width: 100px;
+}
+
+ul.row{
+ overflow: hidden;
+}
+
+ul.row li{
+ float:left;
+ margin-right: 20px;
+ padding: 3px 6px;
+ width: 100px;
+}
+
+.main_content {
+ padding:20px;
+}
+
+.main_content.groups{
+ cursor: default;
+}
Deleted: trunk/controller/templates/base/example_edit.xsl
===================================================================
--- trunk/controller/templates/base/example_edit.xsl 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/templates/base/example_edit.xsl 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -1,80 +0,0 @@
-<!-- item -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<xsl:call-template name="yui_booking_i18n"/>
-<div class="identifier-header">
-<h1><img src="{img_go_home}" />
- <xsl:value-of select="php:function('lang', 'Control_item')" />
-</h1>
-</div>
-
-<div class="yui-content">
- <div id="details">
- <form action="#" method="post">
- <input type="hidden" name="id" value =
"{value_id}">
- </input>
- <dl class="proplist-col">
- <dt>
- <label
for="title">Tittel</label>
- </dt>
- <dd>
- <input type="text" name="title"
id="title" value="" />
- </dd>
- <dt>
- <label
for="required">Obligatorisk</label>
- </dt>
- <dd>
- <input type="checkbox" value=""
/>
- </dd>
- <dt>
- <label for="what_to_do">Hva
skal utføres</label>
- </dt>
- <dd>
- <textarea id="what_to_do"
rows="5" cols="60"></textarea>
- </dd>
- <dt>
- <label
for="how_to_do">Utførelsesbeskrivelse</label>
- </dt>
- <dd>
- <textarea id="how_to_do"
rows="5" cols="60"></textarea>
- </dd>
- <dt>
- <label
for="control_group">Kontrollgruppe</label>
- </dt>
- <dd>
- <select id="control_group"
name="control_group">
- <xsl:apply-templates
select="control_group/options"/>
- </select>
- </dd>
- <dt>
- <label
for="control_area">Kontrolltype</label>
- </dt>
- <dd>
- <select id="control_area"
name="control_area">
- <xsl:apply-templates
select="control_area/options"/>
- </select>
- </dd>
- </dl>
-
- <div class="form-buttons">
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
- <input type="submit"
name="save_control" value="{$lang_save}" title = "{$lang_save}">
- </input>
- </div>
-
- </form>
-
- </div>
- </div>
-</xsl:template>
-
-<xsl:template match="options">
- <option value="{id}">
- <xsl:if test="selected != 0">
- <xsl:attribute name="selected" value="selected" />
- </xsl:if>
- <xsl:value-of disable-output-escaping="yes" select="name"/>
- </option>
-</xsl:template>
-
Deleted: trunk/controller/templates/base/example_normal_tabs.xsl
===================================================================
--- trunk/controller/templates/base/example_normal_tabs.xsl 2011-11-03
06:25:34 UTC (rev 7994)
+++ trunk/controller/templates/base/example_normal_tabs.xsl 2011-11-03
06:32:48 UTC (rev 7995)
@@ -1,33 +0,0 @@
-<!-- separate tabs and inline tables-->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div class="yui-navset yui-navset-top" id="example_tabview">
- <xsl:value-of disable-output-escaping="yes" select="tabs" />
- <div class="yui-content">
- <div id="general">
- <h4><xsl:value-of select="php:function('lang',
'Documents')" /></h4>
- <div id="documents_container"/>
- <a class='button'>
- <xsl:attribute
name="href"><xsl:value-of select="resource/add_document_link"/></xsl:attribute>
- <xsl:if
test="resource/permission/write">
- <xsl:value-of
select="php:function('lang', 'Add Document')" />
- </xsl:if>
- </a>
- <h4><xsl:value-of select="php:function('lang',
'Permissions')" /></h4>
- <div id="permissions_container"/>
- </div>
- <div id="list">
- <h4><xsl:value-of select="php:function('lang',
'list')" /></h4>
- </div>
- <div id="list">
- <h4><xsl:value-of select="php:function('lang',
'dates')" /></h4>
- <xsl:value-of disable-output-escaping="yes"
select="date"/>
- </div>
- </div>
- </div>
- <script type="text/javascript">
- var resource_id = <xsl:value-of select="resource/id"/>;
- var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Category', 'Actions', 'Edit', 'Delete', 'Account', 'Role')"/>;
- </script>
-</xsl:template>
-
Deleted: trunk/controller/templates/base/example_separate_tabs.xsl
===================================================================
--- trunk/controller/templates/base/example_separate_tabs.xsl 2011-11-03
06:25:34 UTC (rev 7994)
+++ trunk/controller/templates/base/example_separate_tabs.xsl 2011-11-03
06:32:48 UTC (rev 7995)
@@ -1,25 +0,0 @@
-<!-- separate tabs and inline tables-->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:value-of disable-output-escaping="yes" select="tabs"/>
-
- <div id="content">
- <h4><xsl:value-of select="php:function('lang', 'Documents')"
/></h4>
- <div id="documents_container"/>
- <a class='button'>
- <xsl:attribute name="href"><xsl:value-of
select="resource/add_document_link"/></xsl:attribute>
- <xsl:if test="resource/permission/write">
- <xsl:value-of select="php:function('lang', 'Add
Document')" />
- </xsl:if>
- </a>
- <h4><xsl:value-of select="php:function('lang', 'Permissions')"
/></h4>
- <div id="permissions_container"/>
- </div>
-
-<script type="text/javascript">
-var resource_id = <xsl:value-of select="resource/id"/>;
- var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Category', 'Actions', 'Edit', 'Delete', 'Account', 'Role')"/>;
-</script>
-
-</xsl:template>
-
Modified: trunk/controller/templates/base/view_check_list.xsl
===================================================================
--- trunk/controller/templates/base/view_check_list.xsl 2011-11-03 06:25:34 UTC
(rev 7994)
+++ trunk/controller/templates/base/view_check_list.xsl 2011-11-03 06:32:48 UTC
(rev 7995)
@@ -1,6 +1,6 @@
-<xsl:template name="view_check_list" xmlns:php="http://php.net/xsl";>
+<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
-<div class="yui-content tab_content">
+<div class="main_content">
<!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
@@ -9,10 +9,9 @@
<ul class="groups">
<xsl:for-each select="saved_groups_with_items_array">
- <li class="drag_group list_item">
+ <li class="list_item">
<h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
- <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
<xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
<input type="hidden"
name="control_group_id" value="{$control_group_id}" />
@@ -34,24 +33,10 @@
<span
class="drag">
<span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
</span>
- <a
class="delete">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="//control_id"/>
-
<xsl:text>&control_item_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
-
<span>x</span>
- </a>
</li>
</xsl:for-each>
</ul>
- <div>
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
- <input type="submit"
id="save_order" name="save_order" value="{$lang_save}" title = "{$lang_save}" />
- </div>
- </form>
+
</li>
</xsl:for-each>
</ul>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7995],
Torstein <=