[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17375] controller: simplify checklist
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17375] controller: simplify checklist |
|
Date: |
Wed, 29 Nov 2017 10:35:57 -0500 (EST) |
Revision: 17375
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17375
Author: sigurdne
Date: 2017-11-29 10:35:57 -0500 (Wed, 29 Nov 2017)
Log Message:
-----------
controller: simplify checklist
Modified Paths:
--------------
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/setup/phpgw_no.lang
trunk/controller/templates/mobilefrontend/css/base.css
trunk/phpgwapi/templates/mobilefrontend/head.inc.php
trunk/phpgwapi/templates/mobilefrontend/head.tpl
trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php
trunk/property/inc/class.uilocation.inc.php
Added Paths:
-----------
trunk/controller/templates/mobilefrontend/check_list/
trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2017-11-28 15:10:00 UTC
(rev 17374)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2017-11-29 15:35:57 UTC
(rev 17375)
@@ -952,6 +952,10 @@
'check_list_id' => $check_list_id));
}
+ $submit_deviation = phpgw::get_var('submit_deviation',
'bool');
+ $submit_ok = phpgw::get_var('submit_ok', 'bool');
+ $save_check_list = phpgw::get_var('save_check_list',
'bool');
+
$control_id = phpgw::get_var('control_id', 'int');
$serie_id = phpgw::get_var('serie_id', 'int');
$status = (int)phpgw::get_var('status');
@@ -978,8 +982,13 @@
$planned_date_ts = $deadline_date_ts;
}
- if ($completed_date != '')
+ if($submit_deviation)
{
+ $completed_date_ts = 0;
+ $status =
controller_check_list::STATUS_NOT_DONE;
+ }
+ else if ($completed_date != '')
+ {
$completed_date_ts =
phpgwapi_datetime::date_to_timestamp($completed_date);
$status = controller_check_list::STATUS_DONE;
}
@@ -988,11 +997,21 @@
$completed_date_ts = 0;
}
+ if($submit_ok)
+ {
+ if(empty($completed_date))
+ {
+ $completed_date_ts = time();
+ }
+ $status = controller_check_list::STATUS_DONE;
+ $assigned_to =
$GLOBALS['phpgw_info']['user']['account_id'];
+ }
+
if ($check_list_id > 0)
{
$check_list =
$this->so->get_single($check_list_id);
- if ($status ==
controller_check_list::STATUS_DONE)
+ if ($status ==
controller_check_list::STATUS_DONE && !$submit_ok)
{
if
(!$this->_check_for_required($check_list))
{
@@ -1003,7 +1022,7 @@
}
else
{
- if ($status ==
controller_check_list::STATUS_DONE)
+ if ($status ==
controller_check_list::STATUS_DONE && !$submit_ok)
{
$status =
controller_check_list::STATUS_NOT_DONE;
$completed_date_ts = 0;
@@ -1052,14 +1071,22 @@
{
$check_list->set_delta_billable_hours($billable_hours);
}
- if ($status == controller_check_list::STATUS_DONE &&
$this->_check_for_required($check_list) && !$error)
+
+ if ($status == controller_check_list::STATUS_DONE &&
!$error)
{
- $check_list->set_status($status);
+ if( $submit_ok ||
$this->_check_for_required($check_list))
+ {
+ $check_list->set_status($status);
+ }
}
else if ($status ==
controller_check_list::STATUS_CANCELED && !$error)
{
$check_list->set_status($status);
}
+ else if ($status ==
controller_check_list::STATUS_NOT_DONE && !$error)
+ {
+ $check_list->set_status($status);
+ }
if (!$error && $check_list->validate())
{
@@ -1166,8 +1193,16 @@
if ($check_list_id > 0)
{
- $this->redirect(array('menuaction' =>
'controller.uicheck_list.edit_check_list',
- 'check_list_id' =>
$check_list_id));
+ if($submit_deviation)
+ {
+
$this->redirect(array('menuaction' => 'controller.uicase.add_case',
+ 'check_list_id' =>
$check_list_id));
+ }
+ else
+ {
+
$this->redirect(array('menuaction' => 'controller.uicheck_list.edit_check_list',
+ 'check_list_id' =>
$check_list_id));
+ }
}
else
{
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2017-11-28 15:10:00 UTC (rev
17374)
+++ trunk/controller/setup/phpgw_no.lang 2017-11-29 15:35:57 UTC (rev
17375)
@@ -409,4 +409,7 @@
choose a location controller no Velg en lokasjon
deadline end of year controller no Frist på slutten av året for
årskontroller
missing start date controller no Mangler startdato
-new revision controller no Ny revisjon
\ No newline at end of file
+new revision controller no Ny revisjon
+deviation controller no Avvik
+save check list controller no Lagre verdier
+plan controller no Planlegg
\ No newline at end of file
Copied: trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
(from rev 17374, trunk/controller/templates/base/check_list/add_check_list.xsl)
===================================================================
--- trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
(rev 0)
+++ trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
2017-11-29 15:35:57 UTC (rev 17375)
@@ -0,0 +1,234 @@
+<!-- $Id$ -->
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <xsl:variable name="date_format">
+ <xsl:value-of select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')" />
+ </xsl:variable>
+ <xsl:variable name="serie_id">
+ <xsl:value-of select="serie_id" />
+ </xsl:variable>
+
+
+ <!-- ================== ADD CHECKLIST ========================= -->
+ <div id="main_content" class="medium">
+
+ <!-- ================== CHECK LIST TOP SECTION
===================== -->
+ <xsl:call-template name="check_list_top_section" />
+
+ <!-- ================== CHECKLIST DETAILS
===================== -->
+ <div id="check_list_details">
+ <h3
class="box_header">Sjekklistedetaljer::<xsl:value-of
select="current_month_name"/></h3>
+
+ <xsl:variable name="action_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicheck_list.save_check_list')" />
+ </xsl:variable>
+
+ <form id="frm_add_check_list" action="{$action_url}"
method="post" class="pure-form pure-form-aligned">
+ <xsl:variable name="control_id">
+ <xsl:value-of select="control/id"/>
+ </xsl:variable>
+ <input type="hidden" name="control_id"
value="{$control_id}" />
+ <input type="hidden" name="serie_id"
value="{$serie_id}" />
+ <xsl:variable name="type">
+ <xsl:value-of select="type"/>
+ </xsl:variable>
+ <input type="hidden" name="type"
value="{$type}" />
+
+ <xsl:variable name="location_code">
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <xsl:variable
name="location_id">
+ <xsl:value-of
select="check_list/location_id"/>
+ </xsl:variable>
+ <input type="hidden"
name="location_id" value="{$location_id}" />
+ <xsl:variable
name="component_id">
+ <xsl:value-of
select="check_list/component_id"/>
+ </xsl:variable>
+ <input type="hidden"
name="component_id" value="{$component_id}" />
+ <input type="hidden"
name="location_code" value="{$location_code}" />
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="hidden"
name="location_code" value="{$location_code}" />
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <!-- STATUS -->
+ <div class="pure-control-group">
+ <xsl:if
test="check_list/error_msg_array/status != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/status" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <label>Status</label>
+ <xsl:variable name="status">
+ <xsl:value-of
select="check_list/status"/>
+ </xsl:variable>
+ <select id="status"
name="status">
+ <xsl:choose>
+ <xsl:when
test="check_list/status = 0">
+ <option
value="1">Utført</option>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:when>
+ <xsl:when
test="check_list/status = 1">
+ <option
value="1" SELECTED="SELECTED">Utført</option>
+ <option
value="0">Ikke utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:when>
+ <xsl:when
test="check_list/status = 3">
+ <option
value="3" SELECTED="SELECTED">Kansellert</option>
+ <option
value="0">Ikke utført</option>
+ <option
value="1">Utført</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
+ <option
value="1">Utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </select>
+ </div>
+ <!-- DEADLINE -->
+ <div class="pure-control-group">
+ <xsl:if
test="check_list/error_msg_array/deadline != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/deadline" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <label>Fristdato</label>
+ <xsl:value-of
select="php:function('date', $date_format, number(check_list/deadline))"/>
+ <input type="hidden"
id="deadline_date" name="deadline_date" >
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="php:function('date', $date_format, number(check_list/deadline))"/>
+ </xsl:attribute>
+ </input>
+ <input type="hidden"
id="original_deadline_date" name="original_deadline_date" >
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="check_list/deadline"/>
+ </xsl:attribute>
+ </input>
+ </div>
+ <!-- PLANNED DATE -->
+ <div class="pure-control-group">
+ <xsl:if
test="check_list/error_msg_array/planned_date != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/planned_date" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <label>Planlagt dato</label>
+ <input type="text"
id="planned_date" name="planned_date" class="date" readonly="readonly">
+ <xsl:if
test="check_list/planned_date != 0 and check_list/planned_date != ''">
+ <xsl:attribute
name="value">
+
<xsl:value-of select="php:function('date', $date_format,
number(check_list/planned_date))"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <!-- COMPLETED DATE -->
+ <div class="pure-control-group">
+ <xsl:if
test="check_list/error_msg_array/completed_date != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/completed_date" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <label>Utført dato</label>
+ <input type="text"
id="completed_date" name="completed_date" class="date" readonly="readonly" >
+ <xsl:if
test="check_list/completed_date != 0 and check_list/completed_date != ''">
+ <xsl:attribute
name="value">
+
<xsl:value-of select="php:function('date', $date_format,
number(check_list/completed_date))"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <!-- ASSIGNMET -->
+ <div class="pure-control-group">
+ <label>Tildelt</label>
+ <select name="assigned_to">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </xsl:attribute>
+ <option value="0">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:apply-templates
select="user_list/options"/>
+ </select>
+ </div>
+ <xsl:if test="required_actual_hours = 1">
+ <div class="pure-control-group">
+ <label>Egne Timer</label>
+ <input class="date">
+ <xsl:attribute
name="id">billable_hours</xsl:attribute>
+ <xsl:attribute
name="name">billable_hours</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="check_list/billable_hours"/>
+ </div>
+ </xsl:if>
+
+ <!-- COMMENT -->
+ <div class="pure-control-group">
+ <label>Kommentar</label>
+ <textarea>
+ <xsl:attribute
name="name">comment</xsl:attribute>
+ <xsl:value-of
select="check_list/comment"/>
+ </textarea>
+ </div>
+ <div class = "pure-g">
+ <div class="pure-u-1-4">
+ <input class="pure-button
pure-button-primary pure-input-1" type="submit" name="save_check_list">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="php:function('lang', 'plan')" />
+ </xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-u-1-4">
+ <input id="submit_ok"
class="pure-button pure-button-primary pure-input-1" type="submit"
name="submit_ok">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="php:function('lang', 'ok')" />
+ </xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-u-1-4">
+ <input id="submit_deviation"
class="pure-button pure-button-primary pure-input-1" type="submit"
name="submit_deviation">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="php:function('lang', 'deviation')" />
+ </xsl:attribute>
+ </input>
+ </div>
+ </div>
+ </form>
+ </div>
+ <xsl:for-each select="integration">
+ <div id="{section}">
+ <iframe id="{section}_content" width="100%"
height="{height}" src="{src}">
+ <p>Your browser does not support
iframes.</p>
+ </iframe>
+ </div>
+ </xsl:for-each>
+ </div>
+</xsl:template>
+
+<!-- New 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>
Copied:
trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl (from
rev 17374, trunk/controller/templates/base/check_list/edit_check_list.xsl)
===================================================================
--- trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
(rev 0)
+++ trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
2017-11-29 15:35:57 UTC (rev 17375)
@@ -0,0 +1,242 @@
+<!-- $Id$ -->
+<xsl:template match="data" name="edit_check_list"
xmlns:php="http://php.net/xsl";>
+ <xsl:variable name="date_format">
+ <xsl:value-of select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')" />
+ </xsl:variable>
+ <xsl:variable name="session_url">
+ <xsl:text>&</xsl:text>
+ <xsl:value-of select="php:function('get_phpgw_session_url')" />
+ </xsl:variable>
+
+ <div id="main_content" class="medium">
+
+ <xsl:call-template name="check_list_top_section">
+ <xsl:with-param
name="active_tab">view_details</xsl:with-param>
+ </xsl:call-template>
+
+
+ <!-- ================== CHECKLIST DETAILS
===================== -->
+ <div id="check_list_details">
+ <h3
class="box_header">Sjekklistedetaljer::<xsl:value-of
select="current_month_name"/></h3>
+ <xsl:variable name="action_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicheck_list.save_check_list')" />
+ </xsl:variable>
+ <form id="frm_update_check_list" action="{$action_url}"
method="post" class="pure-form pure-form-aligned">
+ <div class="pure-control-group">
+ <label>Antall åpne saker</label>
+ <xsl:value-of
select="check_list/num_open_cases"/>
+ </div>
+ <div class="pure-control-group">
+ <label>Antall ventende saker</label>
+ <xsl:value-of
select="check_list/num_pending_cases"/>
+ </div>
+ <xsl:variable name="check_list_id">
+ <xsl:value-of select="check_list/id"/>
+ </xsl:variable>
+ <input id="check_list_id" type="hidden"
name="check_list_id" value="{$check_list_id}" />
+ <xsl:if test="check_list_locked = '1'">
+ <div class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', 'error_msg_control_passed_due_date')" />
+ </div>
+ </xsl:if>
+ <div class="pure-control-group">
+ <label>Status</label>
+ <xsl:variable name="status">
+ <xsl:value-of
select="check_list/status"/>
+ </xsl:variable>
+ <select id="status" name="status">
+ <xsl:choose>
+ <xsl:when
test="check_list/status = 0">
+ <option
value="1">Utført</option>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:when>
+ <xsl:when
test="check_list/status = 1">
+ <option
value="1" SELECTED="SELECTED">Utført</option>
+ <option
value="0">Ikke utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:when>
+ <xsl:when
test="check_list/status = 3">
+ <option
value="3" SELECTED="SELECTED">Kansellert</option>
+ <option
value="0">Ikke utført</option>
+ <option
value="1">Utført</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
+ <option
value="1">Utført</option>
+ <option
value="3">Kansellert</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </select>
+ </div>
+ <div class="pure-control-group">
+ <label>Skal utføres innen</label>
+ <xsl:value-of
select="php:function('date', $date_format, number(check_list/deadline))"/>
+ <input id="deadline_date"
name="deadline_date" type="hidden">
+ <xsl:if
test="check_list/deadline != 0 or check_list/deadline != ''">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="php:function('date', $date_format, number(check_list/deadline))"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ <input type="hidden"
id="original_deadline_date" name="original_deadline_date" >
+ <xsl:attribute name="value">
+ <xsl:value-of
select="check_list/original_deadline"/>
+ </xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <xsl:if
test="check_list/error_msg_array/planned_date != ''">
+ <xsl:variable name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/planned_date" />
+ </xsl:variable>
+ <div class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <label>Planlagt dato</label>
+ <input class="date" readonly="readonly">
+ <xsl:attribute
name="id">planned_date</xsl:attribute>
+ <xsl:attribute
name="name">planned_date</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ <xsl:if
test="check_list/planned_date != 0 and check_list/planned_date != ''">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="php:function('date', $date_format, number(check_list/planned_date))"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <xsl:if
test="check_list/error_msg_array/completed_date != ''">
+ <xsl:variable name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/completed_date" />
+ </xsl:variable>
+ <div class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <label>Utført dato</label>
+ <input class="date" >
+ <xsl:attribute
name="id">completed_date</xsl:attribute>
+ <xsl:attribute
name="name">completed_date</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ <xsl:if
test="check_list/completed_date != 0 and check_list/completed_date != ''">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="php:function('date', $date_format, number(check_list/completed_date))"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <!-- ASSIGNMET -->
+ <div class="pure-control-group">
+ <label>Tildelt</label>
+ <select name="assigned_to">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </xsl:attribute>
+ <option value="0">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:apply-templates
select="user_list/options"/>
+ </select>
+ </div>
+ <xsl:if test="required_actual_hours = 1">
+ <div class="pure-control-group">
+ <label>Egne Timer</label>
+ <input class="date">
+ <xsl:attribute
name="id">billable_hours</xsl:attribute>
+ <xsl:attribute
name="name">billable_hours</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="check_list/billable_hours"/>
+ </div>
+ </xsl:if>
+ <div class="pure-control-group">
+ <label>Kommentar</label>
+ <textarea>
+ <xsl:attribute
name="name">comment</xsl:attribute>
+ <xsl:value-of
select="check_list/comment"/>
+ </textarea>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'files')"/>
+ </label>
+ <div class="pure-u pure-custom" >
+ <xsl:for-each
select="datatable_def">
+ <xsl:if test="container
= 'datatable-container_0'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl'/>
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="config" select ='config'/>
+
</xsl:call-template>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+ </div>
+ <script type="text/javascript">
+ var multi_upload_parans = <xsl:value-of
select="multi_upload_parans"/>;
+ </script>
+ <div class="pure-control-group">
+ <xsl:call-template name="file_upload"/>
+ </div>
+ <xsl:if test="check_list_locked != '1'">
+ <!--div class="form-buttons">
+ <xsl:variable name="lang_save">
+ <xsl:value-of
select="php:function('lang', 'save_check_list')" />
+ </xsl:variable>
+ <input class="btn"
type="submit" name="save_control" value="Lagre detaljer" />
+ </div-->
+ <div class = "pure-g">
+ <div class="pure-u-1-4">
+ <input
class="pure-button pure-button-primary pure-input-1" type="submit"
name="save_check_list">
+ <xsl:attribute
name="value">
+
<xsl:value-of select="php:function('lang', 'save_check_list')" />
+ </xsl:attribute>
+ </input>
+ </div>
+ <xsl:if test =
"check_list/num_open_cases = 0">
+ <div class="pure-u-1-4">
+ <input
id="submit_ok" class="pure-button pure-button-primary pure-input-1"
type="submit" name="submit_ok">
+
<xsl:attribute name="value">
+
<xsl:value-of select="php:function('lang', 'ok')" />
+
</xsl:attribute>
+ </input>
+ </div>
+ </xsl:if>
+ <div class="pure-u-1-4">
+ <input
id="submit_deviation" class="pure-button pure-button-primary pure-input-1"
type="submit" name="submit_deviation">
+ <xsl:attribute
name="value">
+
<xsl:value-of select="php:function('lang', 'deviation')" />
+ </xsl:attribute>
+ </input>
+ </div>
+ </div>
+ </xsl:if>
+
+ </form>
+ </div>
+ <xsl:for-each select="integration">
+ <div id="{section}">
+ <iframe id="{section}_content" width="100%"
height="{height}" src="{src}">
+ <p>Your browser does not support
iframes.</p>
+ </iframe>
+ </div>
+ </xsl:for-each>
+ </div>
+</xsl:template>
+
+
+<!-- New 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>
Modified: trunk/controller/templates/mobilefrontend/css/base.css
===================================================================
--- trunk/controller/templates/mobilefrontend/css/base.css 2017-11-28
15:10:00 UTC (rev 17374)
+++ trunk/controller/templates/mobilefrontend/css/base.css 2017-11-29
15:35:57 UTC (rev 17375)
@@ -15,3 +15,31 @@
text-align: right;
width: 100px;
}
+
+#submit_ok {
+ background-color: #4CAF50; /* Green */
+ /* border: none;
+ color: white;
+ padding: 32px 32px;
+ text-align: center;
+ text-decoration: none;
+ display: inline-block;
+ font-size: 24px;
+ margin: 25px;*/
+}
+#submit_deviation {
+ background-color: #f44336;
+ /* border: none;
+ color: white;
+ padding: 32px 20px;
+ text-align: center;
+ text-decoration: none;
+ display: inline-block;
+ font-size: 24px;
+ margin: 25px;*/
+}
+#submit_group {
+ position: relative;
+ float: left;
+ margin-left: 150px;
+}
Modified: trunk/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-11-28
15:10:00 UTC (rev 17374)
+++ trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-11-29
15:35:57 UTC (rev 17375)
@@ -74,6 +74,29 @@
$tpl_vars['logout_text'] = lang('logout');
$tpl_vars['logout_url'] = $GLOBALS['phpgw']->link('/logout.php');
+ $menu ='';
+ if(empty($GLOBALS['phpgw_info']['flags']['noframework']))
+ {
+ $menu = <<<HTML
+ <div class="home-menu custom-menu-wrapper">
+ <div class="pure-menu custom-menu custom-menu-top">
+ <a href="{$tpl_vars['site_url']}"
class="pure-menu-heading custom-menu-brand">{$tpl_vars['site_title']}</a>
+ <a href="#" class="custom-menu-toggle"
id="toggle"><s class="bar"></s><s class="bar"></s></a>
+ </div>
+ <div class="pure-menu pure-menu-horizontal
pure-menu-scrollable custom-menu custom-menu-bottom custom-menu-tucked"
id="tuckedMenu">
+ <div class="custom-menu-screen"></div>
+ <ul class="pure-menu-list">
+ <li class="pure-menu-item"><a
href="{$tpl_vars['manual_url']}"
class="pure-menu-link">{$tpl_vars['manual_text']}</a></li>
+ <li class="pure-menu-item"><a
href="{$tpl_vars['home_url']}"
class="pure-menu-link">{$tpl_vars['home_text']}</a></li>
+ <li class="pure-menu-item"><a
href="{$tpl_vars['logout_url']}"
class="pure-menu-link">{$tpl_vars['logout_text']}</a></li>
+ </ul>
+ </div>
+ </div>
+HTML;
+
+ }
+ $tpl_vars['menu'] = $menu;
+
$GLOBALS['phpgw']->template->set_var($tpl_vars);
$GLOBALS['phpgw']->template->pfp('out', 'head');
Modified: trunk/phpgwapi/templates/mobilefrontend/head.tpl
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/head.tpl 2017-11-28 15:10:00 UTC
(rev 17374)
+++ trunk/phpgwapi/templates/mobilefrontend/head.tpl 2017-11-29 15:35:57 UTC
(rev 17375)
@@ -31,22 +31,7 @@
</head>
<body>
-
- <div class="home-menu custom-menu-wrapper">
- <div class="pure-menu custom-menu custom-menu-top">
- <a href="{site_url}" class="pure-menu-heading
custom-menu-brand">{site_title}</a>
- <a href="#" class="custom-menu-toggle"
id="toggle"><s class="bar"></s><s class="bar"></s></a>
- </div>
- <div class="pure-menu pure-menu-horizontal
pure-menu-scrollable custom-menu custom-menu-bottom custom-menu-tucked"
id="tuckedMenu">
- <div class="custom-menu-screen"></div>
- <ul class="pure-menu-list">
- <li class="pure-menu-item"><a
href="{manual_url}" class="pure-menu-link">{manual_text}</a></li>
- <li class="pure-menu-item"><a
href="{home_url}" class="pure-menu-link">{home_text}</a></li>
- <li class="pure-menu-item"><a
href="{logout_url}" class="pure-menu-link">{logout_text}</a></li>
- </ul>
- </div>
- </div>
-
+ {menu}
<div id="content-wrapper">
<div id="app_header">{current_app_header}</div>
Modified: trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php 2017-11-28
15:10:00 UTC (rev 17374)
+++ trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php 2017-11-29
15:35:57 UTC (rev 17375)
@@ -80,8 +80,22 @@
$var['topmenu'] = $topmenu;
$GLOBALS['phpgw']->template->set_var($var);
+
$GLOBALS['phpgw']->template->pfp('out','navbar');
+ if( phpgw::get_var('phpgw_return_as') != 'json' && $receipt =
phpgwapi_cache::session_get('phpgwapi', 'phpgw_messages'))
+ {
+ phpgwapi_cache::session_clear('phpgwapi',
'phpgw_messages');
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($receipt);
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
+ foreach($msgbox_data as & $message)
+ {
+ echo "<div class='{$message['msgbox_class']}'>";
+ echo $message['msgbox_text'];
+ echo '</div>';
+ }
+ }
+ $GLOBALS['phpgw']->hooks->process('after_navbar');
register_shutdown_function('parse_footer_end');
}
Modified: trunk/property/inc/class.uilocation.inc.php
===================================================================
--- trunk/property/inc/class.uilocation.inc.php 2017-11-28 15:10:00 UTC (rev
17374)
+++ trunk/property/inc/class.uilocation.inc.php 2017-11-29 15:35:57 UTC (rev
17375)
@@ -2153,7 +2153,7 @@
$cats =
CreateObject('phpgwapi.categories', -1, 'property', '.document');
$cats->supress_info = true;
$categories =
$cats->formatted_xslt_list(array('format' => 'filter', 'selected' => 0,
- 'globals' => true, 'use_acl' =>
true));
+ 'globals' => true, 'use_acl' =>
false));
$default_value = array('cat_id' => '',
'name' => lang('no document type'));
array_unshift($categories['cat_list'],
$default_value);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17375] controller: simplify checklist,
sigurdne <=