[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17366] controller: date format and validation on pro
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17366] controller: date format and validation on procedures |
|
Date: |
Sun, 26 Nov 2017 09:07:03 -0500 (EST) |
Revision: 17366
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17366
Author: sigurdne
Date: 2017-11-26 09:07:03 -0500 (Sun, 26 Nov 2017)
Log Message:
-----------
controller: date format and validation on procedures
Modified Paths:
--------------
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/inc/model/class.procedure.inc.php
trunk/controller/setup/phpgw_no.lang
trunk/controller/templates/base/procedure/procedure_item.xsl
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2017-11-25 19:28:54 UTC
(rev 17365)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2017-11-26 14:07:03 UTC
(rev 17366)
@@ -208,6 +208,8 @@
'id' => $procedure_id));
}
+ $error = false;
+
if (isset($_POST['save_procedure'])) // The user has
pressed the save button
{
if (!$this->add && !$this->edit)
@@ -217,6 +219,13 @@
'id' => $procedure_id));
}
+ $start_date = phpgw::get_var('start_date',
'date');
+ if (!$start_date)
+ {
+
phpgwapi_cache::message_set(lang('missing start date'), 'error');
+ $error = true;
+ }
+
if (isset($procedure)) // Edit procedure
{
$description_txt =
phpgw::get_var('description', 'html');
@@ -233,7 +242,7 @@
$procedure->set_description($description_txt);
$procedure->set_reference($reference_txt);
$procedure->set_attachment(phpgw::get_var('attachment'));
-
$procedure->set_start_date(phpgw::get_var('start_date', 'date'));
+ $procedure->set_start_date($start_date);
$procedure->set_end_date(phpgw::get_var('end_date', 'date'));
$procedure->set_revision_date(phpgw::get_var('revision_date', 'date'));
$procedure->set_control_area_id(phpgw::get_var('control_area'));
@@ -251,12 +260,24 @@
if (isset($procedure_id) &&
$procedure_id > 0)
{
$proc_id = $procedure_id;
+ $this->so->transaction_begin();
if
($this->so->store($procedure))
{
+ $revised_procedures =
$this->so->get_other_revisions($procedure->get_id());
+ $old_revision_arr =
end($revised_procedures);
+
if(!empty($old_revision_arr['id']))
+ {
+ $old_revision =
$this->so->get_single($old_revision_arr['id']);
+
$old_revision->set_end_date($procedure->get_start_date());
+
$this->so->store($old_revision);
+
+ }
$message =
lang('messages_saved_form');
+
$this->so->transaction_commit();
}
else
{
+
$this->so->transaction_abort();
$error =
lang('messages_form_error');
}
}
@@ -445,8 +466,8 @@
$GLOBALS['phpgw']->jqcal->add_listener('end_date');
$GLOBALS['phpgw']->jqcal->add_listener('revision_date');
- $end_date =
$GLOBALS['phpgw']->common->show_date($procedure->get_end_date(), $dateformat);
- $revision_date =
$GLOBALS['phpgw']->common->show_date($procedure->get_revision_date(),
$dateformat);
+ $end_date =
$GLOBALS['phpgw']->common->show_date($procedure->get_end_date(),
$this->dateformat);
+ $revision_date =
$GLOBALS['phpgw']->common->show_date($procedure->get_revision_date(),
$this->dateformat);
$data = array
@@ -454,7 +475,7 @@
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, 'procedure', 'procedure_tabview'),
'view' => "view_procedure",
'value_id' => !empty($procedure) ?
$procedure->get_id() : 0,
- 'start_date' =>
$GLOBALS['phpgw']->common->show_date($procedure->get_start_date() ?
$procedure->get_start_date() : time(), $dateformat),
+ 'start_date' =>
$GLOBALS['phpgw']->common->show_date($procedure->get_start_date() ?
$procedure->get_start_date() : time(), $this->dateformat),
'end_date' => $end_date ? $end_date :
'',
'revision_date' => $revision_date ?
$revision_date : '',
'editable' => true,
@@ -465,6 +486,7 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Procedure');
+
phpgwapi_jquery::formvalidator_generate(array('date', 'security','file'));
$this->use_yui_editor(array('responsibility',
'description', 'reference'));
Modified: trunk/controller/inc/model/class.procedure.inc.php
===================================================================
--- trunk/controller/inc/model/class.procedure.inc.php 2017-11-25 19:28:54 UTC
(rev 17365)
+++ trunk/controller/inc/model/class.procedure.inc.php 2017-11-26 14:07:03 UTC
(rev 17366)
@@ -265,4 +265,16 @@
$this->documents[$new_document_id] =
$new_document;
}
}
+
+ public function validates()
+ {
+ if (!$this->get_start_date())
+ {
+// phpgwapi_cache::message_set(lang('missing start
date'), 'error');
+// return false;
+ }
+
+ return true;
+ }
+
}
\ No newline at end of file
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2017-11-25 19:28:54 UTC (rev
17365)
+++ trunk/controller/setup/phpgw_no.lang 2017-11-26 14:07:03 UTC (rev
17366)
@@ -407,4 +407,5 @@
document types controller no Dokumenttyper
Do not edit archived version controller no Du kan ikke endre
arkiverte versjoner
choose a location controller no Velg en lokasjon
-deadline end of year controller no Frist på slutten av året for
årskontroller
\ No newline at end of file
+deadline end of year controller no Frist på slutten av året for
årskontroller
+missing start date controller no Mangler startdato
\ No newline at end of file
Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl
2017-11-25 19:28:54 UTC (rev 17365)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl
2017-11-26 14:07:03 UTC (rev 17366)
@@ -9,7 +9,7 @@
<div class="yui-content">
<div id="details">
- <form action="#" method="post">
+ <form action="#" method="post" id="form">
<input type="hidden" name="id" value =
"{value_id}">
</input>
<dl class="proplist-col">
@@ -62,6 +62,12 @@
<xsl:choose>
<xsl:when
test="editable">
<input
type="text" id="start_date" name="start_date" size="10" value="{start_date}"
readonly="readonly">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="php:function('lang','missing start date')" />
+
</xsl:attribute>
</input>
</xsl:when>
<xsl:otherwise>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17366] controller: date format and validation on procedures,
sigurdne <=