This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 6fa895e8b186186897b11d9e17e6291a49b9ab32 (commit)
via 659fbad57236b17653f556d3522c591ae420dcaf (commit)
via b34310cc57c052eabbe4c62726a67463cebca6d9 (commit)
via 0107d2b4de292e00879e6e831dd250938c70fbe6 (commit)
from 870bb9b3ccabefe655546f8ab480a0d63d41f33e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=6fa895e8b186186897b11d9e17e6291a49b9ab32
commit 6fa895e8b186186897b11d9e17e6291a49b9ab32
Author: Franck Villaume <[email protected]>
Date: Tue Jun 15 12:03:49 2021 +0200
use jQuery vs. $
diff --git a/src/www/include/jquery_plugins.php
b/src/www/include/jquery_plugins.php
index 3ea140b..575dabf0 100644
--- a/src/www/include/jquery_plugins.php
+++ b/src/www/include/jquery_plugins.php
@@ -33,6 +33,6 @@ function init_datetimepicker() {
step: 15
';
- $javascript = "$.datetimepicker.setLocale('".$language_code."');
$('.datetimepicker').datetimepicker({".$attributes."});";
- return html_e('script', array( 'type'=>'text/javascript'),
'//<![CDATA['."\n".'$(function(){'.$javascript.'});'."\n".'//]]>');
+ $javascript = "jQuery.datetimepicker.setLocale('".$language_code."');
jQuery('.datetimepicker').datetimepicker({".$attributes."});";
+ return html_e('script', array( 'type'=>'text/javascript'),
'//<![CDATA['."\n".'jQuery(function(){'.$javascript.'});'."\n".'//]]>');
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=659fbad57236b17653f556d3522c591ae420dcaf
commit 659fbad57236b17653f556d3522c591ae420dcaf
Merge: 870bb9b b34310c
Author: Franck Villaume <[email protected]>
Date: Tue Jun 15 11:49:44 2021 +0200
Merge remote-tracking branch 'rhabacker/master-ticket-886'
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b34310cc57c052eabbe4c62726a67463cebca6d9
commit b34310cc57c052eabbe4c62726a67463cebca6d9
Author: Ralf Habacker <[email protected]>
Date: Tue Jun 8 08:55:49 2021 +0200
Fix incorrect date picker related german translation
diff --git a/src/locale/de.po b/src/locale/de.po
index 572cabb..fa0c830 100644
--- a/src/locale/de.po
+++ b/src/locale/de.po
@@ -19603,8 +19603,9 @@ msgid ""
"The system will modify your start/end dates if you attempt to create a start "
"date earlier than the end date of any tasks you depend on."
msgstr ""
-"Das System wird Ihre Anfangs- und Enddaten ändern, falls Sie versuchen ein "
-"Startdatum früher als das Enddatum eines Auftrags anzulegen."
+"Das System ändert Ihre Start-/Enddaten, wenn Sie versuchen, ein Startdatum zu"
+" erstellen, das vor dem Enddatum von Aufträgen liegt, von denen Sie abhängig"
+" sind."
#: www/pm/add_task.php:103 www/pm/mod_task.php:154
msgid "View Calendar"
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0107d2b4de292e00879e6e831dd250938c70fbe6
commit 0107d2b4de292e00879e6e831dd250938c70fbe6
Author: Ralf Habacker <[email protected]>
Date: Tue Jun 8 08:51:25 2021 +0200
[#886] Use java script based calendar for task creating and updating
diff --git a/src/www/include/jquery_plugins.php
b/src/www/include/jquery_plugins.php
index c8f9787..3ea140b 100644
--- a/src/www/include/jquery_plugins.php
+++ b/src/www/include/jquery_plugins.php
@@ -28,6 +28,11 @@ function init_datetimepicker() {
$language_code = substr($language_code, 0, 2);
}
$datetime_format = _('Y-m-d H:i');
- $javascript = "$.datetimepicker.setLocale('".$language_code."');
$('.datetimepicker').datetimepicker({format:'".$datetime_format."'});";
+ $attributes = '
+ format:"'.$datetime_format.'",
+ step: 15
+ ';
+
+ $javascript = "$.datetimepicker.setLocale('".$language_code."');
$('.datetimepicker').datetimepicker({".$attributes."});";
return html_e('script', array( 'type'=>'text/javascript'),
'//<![CDATA['."\n".'$(function(){'.$javascript.'});'."\n".'//]]>');
}
diff --git a/src/www/pm/add_task.php b/src/www/pm/add_task.php
index 1486619..11a9d7c 100644
--- a/src/www/pm/add_task.php
+++ b/src/www/pm/add_task.php
@@ -30,8 +30,10 @@ global $HTML, $pg, $pt;
$related_artifact_id = getIntFromRequest('related_artifact_id');
$related_artifact_summary = getStringFromRequest('related_artifact_summary');
+html_use_jquerydatetimepicker();
pm_header(array('title'=>_('Add a new
Task'),'group_project_id'=>$group_project_id, 'modal' => 1));
echo notepad_func();
+echo init_datetimepicker();
$params['name'] = 'details';
$params['body'] = '';
@@ -73,22 +75,13 @@ $cells[] = array('<strong>'._('Estimated
Hours').utils_requiredField()._(':').'<
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[] = array('<strong>'._('Start Date')._(':').'</strong><br />'.
- $pg->showDayBox('start_day', date('d', time()), false).
- $pg->showMonthBox ('start_month', date('m', time()), false).
- $pg->showYearBox ('start_year',date('Y', time()), false).
- $pg->showHourBox ('start_hour',date('G', time()), false).
- $pg->showMinuteBox ('start_minute', date('i', 15*(time()%15)),
false).
- '<br />'._('The system will modify your start/end dates if you
attempt to create a start date earlier than the end date of any tasks you
depend on.').
- '<br
/>'.util_make_link('/pm/calendar.php?group_id='.$group_id.'&group_project_id='.$group_project_id,
_('View Calendar'), array('target' => '_blank')),
+ '<input class="datetimepicker" type="text" name="start_date"
value="'.date(_('Y-m-d H:i'), time()).'">'.
+ '<br />'._('The system will modify your start/end dates if you
attempt to create a start date earlier than the end date of any tasks you
depend on.'),
'colspan' => 2);
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[] = array('<strong>'._('End Date')._(':').'</strong><br />'.
- $pg->showDayBox('end_day', date('d', time()+604800), false).
- $pg->showMonthBox ('end_month', date('m', time()+604800),
false).
- $pg->showYearBox ('end_year',date('Y', time()+604800), false).
- $pg->showHourBox ('end_hour',date('G', time()+604800), false).
- $pg->showMinuteBox ('end_minute', date('i',
15*(time()+604800%15)), false),
+ '<input class="datetimepicker" type="text" name="end_date"
value="'.date(_('Y-m-d H:i'), time()+604800).'">',
'colspan' => 2);
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
diff --git a/src/www/pm/mod_task.php b/src/www/pm/mod_task.php
index b82d4d3..f8c0699 100644
--- a/src/www/pm/mod_task.php
+++ b/src/www/pm/mod_task.php
@@ -37,9 +37,11 @@ if (getStringFromRequest('commentsort') == 'anti') {
$sort_comments_chronologically = true;
}
+html_use_jquerydatetimepicker();
pm_header(array('title' => _('Modify Task'), 'pagename' => 'pm_modtask',
'group_project_id' => $group_project_id));
echo notepad_func();
+echo init_datetimepicker();
echo $HTML->openForm(array('action' =>
'/pm/task.php?group_id='.$group_id.'&group_project_id='.$group_project_id, 'id'
=> 'modtaskform', 'method' => 'post'));
?>
@@ -151,26 +153,15 @@ unset($GLOBALS['editor_was_set_up']);
<tr>
<td colspan="3">
<strong><?php echo _('Start Date') . _(': '); ?></strong><br />
- <?php
- $pg->showMonthBox ('start_month',date('m',
$pt->getStartDate()));
- $pg->showDayBox ('start_day',date('d', $pt->getStartDate()));
- $pg->showYearBox ('start_year',date('Y', $pt->getStartDate()));
- $pg->showHourBox ('start_hour',date('G', $pt->getStartDate()));
- $pg->showMinuteBox
('start_minute',date('i',$pt->getStartDate()));
- ?><br /><?php echo _('The system will modify your start/end
dates if you attempt to create a start date earlier than the end date of any
tasks you depend on.') ?>
- <br /><?php
util_make_link('/pm/calendar.php?group_id='.$group_id.'&group_project_id='.$group_project_id,
_('View Calendar'), array('target' => '_blank')) ?>
+ <input class="datetimepicker" type="text" name="start_date"
value="<?php echo date(_('Y-m-d H:i'), $pt->getStartDate()); ?>">
+ <br /><?php echo _('The system will modify your start/end dates
if you attempt to create a start date earlier than the end date of any tasks
you depend on.') ?>
</td>
</tr>
<tr>
<td colspan="3">
<strong><?php echo _('End Date') . _(': '); ?></strong><br />
- <?php
- $pg->showMonthBox ('end_month',date('m', $pt->getEndDate()));
- $pg->showDayBox ('end_day',date('d', $pt->getEndDate()));
- $pg->showYearBox ('end_year',date('Y', $pt->getEndDate()));
- $pg->showHourBox ('end_hour',date('G', $pt->getEndDate()));
- $pg->showMinuteBox ('end_minute',date('i', $pt->getEndDate()));
+ <input class="datetimepicker" name="end_date" type="text"
value="<?php echo date(_('Y-m-d H:i'), $pt->getEndDate()); ?>"
?>
</td>
</tr>
diff --git a/src/www/pm/task.php b/src/www/pm/task.php
index 594bdc3..f27c132 100644
--- a/src/www/pm/task.php
+++ b/src/www/pm/task.php
@@ -35,22 +35,12 @@ require_once $gfcommon.'pm/ProjectGroupFactory.class.php';
$group_id = getIntFromRequest('group_id');
$group_project_id = getIntFromRequest('group_project_id');
$project_task_id = getIntFromRequest('project_task_id');
-$start_hour = getStringFromRequest('start_hour');
-$start_minute = getStringFromRequest('start_minute');
-$start_month = getStringFromRequest('start_month');
-$start_day = getStringFromRequest('start_day');
-$start_year = getStringFromRequest('start_year');
-$end_hour = getStringFromRequest('end_hour');
-$end_minute = getStringFromRequest('end_minute');
-$end_month = getStringFromRequest('end_month');
-$end_day = getStringFromRequest('end_day');
-$end_year = getStringFromRequest('end_year');
$summary = getStringFromRequest('summary');
$details = getStringFromRequest('details');
$priority = getStringFromRequest('priority');
$hours = getStringFromRequest('hours');
-$start_date = getStringFromRequest('start_date');
-$end_date = getStringFromRequest('end_date');
+$start_date_string = getStringFromRequest('start_date');
+$end_date_string = getStringFromRequest('end_date');
$status_id = getIntFromRequest('status_id');
$category_id = getIntFromRequest('category_id');
$percent_complete = getStringFromRequest('percent_complete');
@@ -133,8 +123,10 @@ switch (getStringFromRequest('func')) {
if (!is_array($dependent_on)) {
$dependent_on=array();
}
-
$start_date=mktime($start_hour,$start_minute,0,$start_month,$start_day,$start_year);
-
$end_date=mktime($end_hour,$end_minute,0,$end_month,$end_day,$end_year);
+ $datetime = DateTime::createFromFormat(_('Y-m-d H:i'),
$start_date_string);
+ $start_date = $datetime->getTimestamp();
+ $datetime = DateTime::createFromFormat(_('Y-m-d H:i'),
$end_date_string);
+ $end_date = $datetime->getTimestamp();
$sanitizer = new TextSanitizer();
$details = $sanitizer->purify($details);
@@ -181,8 +173,11 @@ switch (getStringFromRequest('func')) {
if (!$dependent_on) {
$dependent_on=array();
}
-
$start_date=mktime($start_hour,$start_minute,0,$start_month,$start_day,$start_year);
-
$end_date=mktime($end_hour,$end_minute,0,$end_month,$end_day,$end_year);
+ $datetime = DateTime::createFromFormat(_('Y-m-d H:i'),
$start_date_string);
+ $start_date = $datetime->getTimestamp();
+ $datetime = DateTime::createFromFormat(_('Y-m-d H:i'),
$end_date_string);
+ $end_date = $datetime->getTimestamp();
+
if
(!$pt->update($summary,$details,$priority,$hours,$start_date,$end_date,
$status_id,$category_id,$percent_complete,$assigned_to,$pt->convertDependentOn($dependent_on),$new_group_project_id,$duration,$parent_id))
{
exit_error('update: '.$pt->getErrorMessage(),'pm');
-----------------------------------------------------------------------
Summary of changes:
src/locale/de.po | 5 +++--
src/www/include/jquery_plugins.php | 9 +++++++--
src/www/pm/add_task.php | 17 +++++------------
src/www/pm/mod_task.php | 19 +++++--------------
src/www/pm/task.php | 27 +++++++++++----------------
5 files changed, 31 insertions(+), 46 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
