Revision: 1817
http://mrbs.svn.sourceforge.net/mrbs/?rev=1817&view=rev
Author: cimorrison
Date: 2011-04-15 17:55:40 +0000 (Fri, 15 Apr 2011)
Log Message:
-----------
Added an option to make the default duration All Day
Modified Paths:
--------------
mrbs/trunk/tables.my.pre41.sql
mrbs/trunk/tables.my.sql
mrbs/trunk/tables.pg.pre73.sql
mrbs/trunk/tables.pg.sql
mrbs/trunk/web/Themes/default/header.inc
mrbs/trunk/web/dbsys.inc
mrbs/trunk/web/edit_area_room.php
mrbs/trunk/web/functions.inc
mrbs/trunk/web/internalconfig.inc.php
mrbs/trunk/web/mrbs.css.php
mrbs/trunk/web/systemdefaults.inc.php
Added Paths:
-----------
mrbs/trunk/web/upgrade/27/
mrbs/trunk/web/upgrade/27/mysql.sql
mrbs/trunk/web/upgrade/27/pgsql.sql
Modified: mrbs/trunk/tables.my.pre41.sql
===================================================================
--- mrbs/trunk/tables.my.pre41.sql 2011-04-15 17:40:49 UTC (rev 1816)
+++ mrbs/trunk/tables.my.pre41.sql 2011-04-15 17:55:40 UTC (rev 1817)
@@ -19,30 +19,31 @@
CREATE TABLE mrbs_area
(
- id int NOT NULL auto_increment,
- disabled tinyint(1) DEFAULT 0 NOT NULL,
- area_name varchar(30),
- area_admin_email text,
- resolution int,
- default_duration int,
- morningstarts int,
- morningstarts_minutes int,
- eveningends int,
- eveningends_minutes int,
- private_enabled tinyint(1),
- private_default tinyint(1),
- private_mandatory tinyint(1),
- private_override varchar(32),
- min_book_ahead_enabled tinyint(1),
- min_book_ahead_secs int,
- max_book_ahead_enabled tinyint(1),
- max_book_ahead_secs int,
- custom_html text,
- approval_enabled tinyint(1),
- reminders_enabled tinyint(1),
- enable_periods tinyint(1),
- confirmation_enabled tinyint(1),
- confirmed_default tinyint(1),
+ id int NOT NULL auto_increment,
+ disabled tinyint(1) DEFAULT 0 NOT NULL,
+ area_name varchar(30),
+ area_admin_email text,
+ resolution int,
+ default_duration int,
+ default_duration_all_day tinyint(1) DEFAULT 0 NOT NULL,
+ morningstarts int,
+ morningstarts_minutes int,
+ eveningends int,
+ eveningends_minutes int,
+ private_enabled tinyint(1),
+ private_default tinyint(1),
+ private_mandatory tinyint(1),
+ private_override varchar(32),
+ min_book_ahead_enabled tinyint(1),
+ min_book_ahead_secs int,
+ max_book_ahead_enabled tinyint(1),
+ max_book_ahead_secs int,
+ custom_html text,
+ approval_enabled tinyint(1),
+ reminders_enabled tinyint(1),
+ enable_periods tinyint(1),
+ confirmation_enabled tinyint(1),
+ confirmed_default tinyint(1),
PRIMARY KEY (id)
);
@@ -138,6 +139,6 @@
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ( 'db_version', '26');
+ VALUES ( 'db_version', '27');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ( 'local_db_version', '1');
Modified: mrbs/trunk/tables.my.sql
===================================================================
--- mrbs/trunk/tables.my.sql 2011-04-15 17:40:49 UTC (rev 1816)
+++ mrbs/trunk/tables.my.sql 2011-04-15 17:55:40 UTC (rev 1817)
@@ -19,30 +19,31 @@
CREATE TABLE mrbs_area
(
- id int NOT NULL auto_increment,
- disabled tinyint(1) DEFAULT 0 NOT NULL,
- area_name varchar(30) CHARACTER SET utf8 COLLATE
utf8_general_ci,
- area_admin_email text CHARACTER SET utf8 COLLATE utf8_general_ci,
- resolution int,
- default_duration int,
- morningstarts int,
- morningstarts_minutes int,
- eveningends int,
- eveningends_minutes int,
- private_enabled tinyint(1),
- private_default tinyint(1),
- private_mandatory tinyint(1),
- private_override varchar(32) CHARACTER SET utf8 COLLATE
utf8_general_ci,
- min_book_ahead_enabled tinyint(1),
- min_book_ahead_secs int,
- max_book_ahead_enabled tinyint(1),
- max_book_ahead_secs int,
- custom_html text CHARACTER SET utf8 COLLATE utf8_general_ci,
- approval_enabled tinyint(1),
- reminders_enabled tinyint(1),
- enable_periods tinyint(1),
- confirmation_enabled tinyint(1),
- confirmed_default tinyint(1),
+ id int NOT NULL auto_increment,
+ disabled tinyint(1) DEFAULT 0 NOT NULL,
+ area_name varchar(30) CHARACTER SET utf8 COLLATE
utf8_general_ci,
+ area_admin_email text CHARACTER SET utf8 COLLATE utf8_general_ci,
+ resolution int,
+ default_duration int,
+ default_duration_all_day tinyint(1) DEFAULT 0 NOT NULL,
+ morningstarts int,
+ morningstarts_minutes int,
+ eveningends int,
+ eveningends_minutes int,
+ private_enabled tinyint(1),
+ private_default tinyint(1),
+ private_mandatory tinyint(1),
+ private_override varchar(32) CHARACTER SET utf8 COLLATE
utf8_general_ci,
+ min_book_ahead_enabled tinyint(1),
+ min_book_ahead_secs int,
+ max_book_ahead_enabled tinyint(1),
+ max_book_ahead_secs int,
+ custom_html text CHARACTER SET utf8 COLLATE utf8_general_ci,
+ approval_enabled tinyint(1),
+ reminders_enabled tinyint(1),
+ enable_periods tinyint(1),
+ confirmation_enabled tinyint(1),
+ confirmed_default tinyint(1),
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -138,6 +139,6 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ( 'db_version', '26');
+ VALUES ( 'db_version', '27');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ( 'local_db_version', '1');
Modified: mrbs/trunk/tables.pg.pre73.sql
===================================================================
--- mrbs/trunk/tables.pg.pre73.sql 2011-04-15 17:40:49 UTC (rev 1816)
+++ mrbs/trunk/tables.pg.pre73.sql 2011-04-15 17:55:40 UTC (rev 1817)
@@ -22,30 +22,31 @@
CREATE TABLE mrbs_area
(
- id serial primary key,
- disabled smallint DEFAULT 0 NOT NULL,
- area_name varchar(30),
- area_admin_email text,
- resolution int,
- default_duration int,
- morningstarts int,
- morningstarts_minutes int,
- eveningends int,
- eveningends_minutes int,
- private_enabled smallint,
- private_default smallint,
- private_mandatory smallint,
- private_override varchar(32),
- min_book_ahead_enabled smallint,
- min_book_ahead_secs int,
- max_book_ahead_enabled smallint,
- max_book_ahead_secs int,
- custom_html text,
- approval_enabled smallint,
- reminders_enabled smallint,
- enable_periods smallint,
- confirmation_enabled smallint,
- confirmed_default smallint
+ id serial primary key,
+ disabled smallint DEFAULT 0 NOT NULL,
+ area_name varchar(30),
+ area_admin_email text,
+ resolution int,
+ default_duration int,
+ default_duration_all_day smallint DEFAULT 0 NOT NULL,
+ morningstarts int,
+ morningstarts_minutes int,
+ eveningends int,
+ eveningends_minutes int,
+ private_enabled smallint,
+ private_default smallint,
+ private_mandatory smallint,
+ private_override varchar(32),
+ min_book_ahead_enabled smallint,
+ min_book_ahead_secs int,
+ max_book_ahead_enabled smallint,
+ max_book_ahead_secs int,
+ custom_html text,
+ approval_enabled smallint,
+ reminders_enabled smallint,
+ enable_periods smallint,
+ confirmation_enabled smallint,
+ confirmed_default smallint
);
CREATE TABLE mrbs_room
@@ -129,6 +130,6 @@
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ('db_version', '26');
+ VALUES ('db_version', '27');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ('local_db_version', '1');
Modified: mrbs/trunk/tables.pg.sql
===================================================================
--- mrbs/trunk/tables.pg.sql 2011-04-15 17:40:49 UTC (rev 1816)
+++ mrbs/trunk/tables.pg.sql 2011-04-15 17:55:40 UTC (rev 1817)
@@ -35,30 +35,31 @@
CREATE TABLE mrbs_area
(
- id serial primary key,
- disabled smallint DEFAULT 0 NOT NULL,
- area_name varchar(30),
- area_admin_email text,
- resolution int,
- default_duration int,
- morningstarts int,
- morningstarts_minutes int,
- eveningends int,
- eveningends_minutes int,
- private_enabled smallint,
- private_default smallint,
- private_mandatory smallint,
- private_override varchar(32),
- min_book_ahead_enabled smallint,
- min_book_ahead_secs int,
- max_book_ahead_enabled smallint,
- max_book_ahead_secs int,
- custom_html text,
- approval_enabled smallint,
- reminders_enabled smallint,
- enable_periods smallint,
- confirmation_enabled smallint,
- confirmed_default smallint
+ id serial primary key,
+ disabled smallint DEFAULT 0 NOT NULL,
+ area_name varchar(30),
+ area_admin_email text,
+ resolution int,
+ default_duration int,
+ default_duration_all_day smallint DEFAULT 0 NOT NULL,
+ morningstarts int,
+ morningstarts_minutes int,
+ eveningends int,
+ eveningends_minutes int,
+ private_enabled smallint,
+ private_default smallint,
+ private_mandatory smallint,
+ private_override varchar(32),
+ min_book_ahead_enabled smallint,
+ min_book_ahead_secs int,
+ max_book_ahead_enabled smallint,
+ max_book_ahead_secs int,
+ custom_html text,
+ approval_enabled smallint,
+ reminders_enabled smallint,
+ enable_periods smallint,
+ confirmation_enabled smallint,
+ confirmed_default smallint
);
CREATE TABLE mrbs_room
@@ -142,6 +143,6 @@
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ('db_version', '26');
+ VALUES ('db_version', '27');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ('local_db_version', '1');
Modified: mrbs/trunk/web/Themes/default/header.inc
===================================================================
--- mrbs/trunk/web/Themes/default/header.inc 2011-04-15 17:40:49 UTC (rev
1816)
+++ mrbs/trunk/web/Themes/default/header.inc 2011-04-15 17:55:40 UTC (rev
1817)
@@ -75,6 +75,7 @@
global $auth;
global $default_language_tokens, $disable_automatic_language_changing,
$override_locale;
global $lang_map_windows, $langs, $server_os;
+ global $default_duration_all_day;
$page = basename($PHP_SELF, ".php");
$user = getUserName();
@@ -458,13 +459,13 @@
var endMonth = parseInt(form.end_datepicker_alt_month.value, 10);
var endYear = parseInt(form.end_datepicker_alt_year.value, 10);
var endDate = new Date(endYear, endMonth - 1, endDay, 12);
-
+
diff = (endDate - startDate)/(24 * 60 * 60 * 1000);
diff = Math.round(diff);
<?php
}
?>
-
+
return diff;
}
@@ -698,9 +699,9 @@
$(startId).width(maxWidth);
$(endId).width(maxWidth);
} <?php // function adjustSlotSelectors() ?>
-
+
<?php
-}
+} // edit_entry
if ($page == 'pending')
@@ -835,6 +836,7 @@
{
form.name.focus();
}
+
<?php
// Get the current vocab (in the appropriate language) for periods,
// minutes, hours
@@ -904,7 +906,19 @@
}
<?php
+ // Check the All Day box if that's the default and then call the function
+ // that handles changes
+ if ($default_duration_all_day)
+ {
+ ?>
+ $('#all_day').attr('checked', true);
+ OnAllDayClick(true);
+ <?php
}
+ ?>
+
+ <?php
+ } // EDIT_ENTRY
// PENDING.PHP
if ($page == 'pending')
Modified: mrbs/trunk/web/dbsys.inc
===================================================================
--- mrbs/trunk/web/dbsys.inc 2011-04-15 17:40:49 UTC (rev 1816)
+++ mrbs/trunk/web/dbsys.inc 2011-04-15 17:55:40 UTC (rev 1817)
@@ -15,7 +15,7 @@
$tbl_variables = $db_tbl_prefix . "variables";
-$db_schema_version = 26;
+$db_schema_version = 27;
$local_db_schema_version = 1;
Modified: mrbs/trunk/web/edit_area_room.php
===================================================================
--- mrbs/trunk/web/edit_area_room.php 2011-04-15 17:40:49 UTC (rev 1816)
+++ mrbs/trunk/web/edit_area_room.php 2011-04-15 17:55:40 UTC (rev 1817)
@@ -64,6 +64,7 @@
$area_morning_ampm = get_form_var('area_morning_ampm', 'string');
$area_res_mins = get_form_var('area_res_mins', 'int');
$area_def_duration_mins = get_form_var('area_def_duration_mins', 'int');
+$area_def_duration_all_day = get_form_var('area_def_duration_all_day',
'string');
$area_eveningends = get_form_var('area_eveningends', 'int');
$area_eveningends_minutes = get_form_var('area_eveningends_minutes', 'int');
$area_evening_ampm = get_form_var('area_evening_ampm', 'string');
@@ -346,6 +347,7 @@
// Convert booleans into 0/1 (necessary for PostgreSQL)
$area_disabled = (!empty($area_disabled)) ? 1 : 0;
+ $area_def_duration_all_day = (!empty($area_def_duration_all_day)) ? 1 : 0;
$area_min_ba_enabled = (!empty($area_min_ba_enabled)) ? 1 : 0;
$area_max_ba_enabled = (!empty($area_max_ba_enabled)) ? 1 : 0;
$area_private_enabled = (!empty($area_private_enabled)) ? 1 : 0;
@@ -398,6 +400,7 @@
{
$assign_array[] = "resolution=" . $area_res_mins * 60;
$assign_array[] = "default_duration=" . $area_def_duration_mins * 60;
+ $assign_array[] = "default_duration_all_day=" .
$area_def_duration_all_day;
$assign_array[] = "morningstarts=" . $area_morningstarts;
$assign_array[] = "morningstarts_minutes=" .
$area_morningstarts_minutes;
$assign_array[] = "eveningends=" . $area_eveningends;
@@ -920,6 +923,12 @@
<div class="div_dur_mins">
<label for="area_def_duration_mins"><?php echo
get_vocab("area_def_duration_mins") ?>:</label>
<input type="text" id="area_def_duration_mins"
name="area_def_duration_mins" value="<?php echo $default_duration/60 ?>">
+ <?php
+ echo "<input type=\"checkbox\" id=\"area_def_duration_all_day\"
name=\"area_def_duration_all_day\"" .
+ (($default_duration_all_day) ? " checked=\"checked\"" : "") .
+ ">\n";
+ ?>
+ <label class="secondary" "for="area_def_duration_all_day"><?php echo
get_vocab("all_day") ?></label>
</div>
<?php
echo "<div id=\"last_slot\">\n";
Modified: mrbs/trunk/web/functions.inc
===================================================================
--- mrbs/trunk/web/functions.inc 2011-04-15 17:40:49 UTC (rev 1816)
+++ mrbs/trunk/web/functions.inc 2011-04-15 17:55:40 UTC (rev 1817)
@@ -659,14 +659,16 @@
function get_area_settings($area)
{
global $tbl_area, $force_resolution;
- global $resolution, $default_duration, $morningstarts,
$morningstarts_minutes, $eveningends, $eveningends_minutes;
+ global $resolution, $default_duration, $default_duration_all_day;
+ global $morningstarts, $morningstarts_minutes, $eveningends,
$eveningends_minutes;
global $private_enabled, $private_default, $private_mandatory,
$private_override;
global $min_book_ahead_enabled, $max_book_ahead_enabled,
$min_book_ahead_secs, $max_book_ahead_secs;
global $approval_enabled, $reminders_enabled, $enable_periods,
$boolean_fields;
global $confirmation_enabled, $confirmed_default;
// Get all the "per area" config settings
- $sql = "SELECT resolution, default_duration, morningstarts,
morningstarts_minutes,
+ $sql = "SELECT resolution, default_duration, default_duration_all_day,
+ morningstarts, morningstarts_minutes,
eveningends, eveningends_minutes,
private_enabled, private_default, private_mandatory,
private_override,
min_book_ahead_enabled, max_book_ahead_enabled,
Modified: mrbs/trunk/web/internalconfig.inc.php
===================================================================
--- mrbs/trunk/web/internalconfig.inc.php 2011-04-15 17:40:49 UTC (rev
1816)
+++ mrbs/trunk/web/internalconfig.inc.php 2011-04-15 17:55:40 UTC (rev
1817)
@@ -204,7 +204,8 @@
'custom_html');
// Boolean fields. These are fields which are treated as booleans
-$boolean_fields['area'] = array('private_enabled',
+$boolean_fields['area'] = array('default_duration_all_day',
+ 'private_enabled',
'private_default',
'private_mandatory',
'min_book_ahead_enabled',
@@ -225,25 +226,26 @@
// per-area settings and perhaps ought to be revisited at some stage]
$area_defaults = array();
-$area_defaults['resolution'] = $resolution;
-$area_defaults['default_duration'] = $default_duration;
-$area_defaults['morningstarts'] = $morningstarts;
-$area_defaults['morningstarts_minutes'] = $morningstarts_minutes;
-$area_defaults['eveningends'] = $eveningends;
-$area_defaults['eveningends_minutes'] = $eveningends_minutes;
-$area_defaults['private_enabled'] = $private_enabled;
-$area_defaults['private_default'] = $private_default;
-$area_defaults['private_mandatory'] = $private_mandatory;
-$area_defaults['private_override'] = $private_override;
-$area_defaults['min_book_ahead_enabled'] = $min_book_ahead_enabled;
-$area_defaults['max_book_ahead_enabled'] = $max_book_ahead_enabled;
-$area_defaults['min_book_ahead_secs'] = $min_book_ahead_secs;
-$area_defaults['max_book_ahead_secs'] = $max_book_ahead_secs;
-$area_defaults['approval_enabled'] = $approval_enabled;
-$area_defaults['reminders_enabled'] = $reminders_enabled;
-$area_defaults['enable_periods'] = $enable_periods;
-$area_defaults['confirmation_enabled'] = $confirmation_enabled;
-$area_defaults['confirmed_default'] = $confirmed_default;
+$area_defaults['resolution'] = $resolution;
+$area_defaults['default_duration'] = $default_duration;
+$area_defaults['default_duration_all_day'] = $default_duration_all_day;
+$area_defaults['morningstarts'] = $morningstarts;
+$area_defaults['morningstarts_minutes'] = $morningstarts_minutes;
+$area_defaults['eveningends'] = $eveningends;
+$area_defaults['eveningends_minutes'] = $eveningends_minutes;
+$area_defaults['private_enabled'] = $private_enabled;
+$area_defaults['private_default'] = $private_default;
+$area_defaults['private_mandatory'] = $private_mandatory;
+$area_defaults['private_override'] = $private_override;
+$area_defaults['min_book_ahead_enabled'] = $min_book_ahead_enabled;
+$area_defaults['max_book_ahead_enabled'] = $max_book_ahead_enabled;
+$area_defaults['min_book_ahead_secs'] = $min_book_ahead_secs;
+$area_defaults['max_book_ahead_secs'] = $max_book_ahead_secs;
+$area_defaults['approval_enabled'] = $approval_enabled;
+$area_defaults['reminders_enabled'] = $reminders_enabled;
+$area_defaults['enable_periods'] = $enable_periods;
+$area_defaults['confirmation_enabled'] = $confirmation_enabled;
+$area_defaults['confirmed_default'] = $confirmed_default;
/********************************************************
Modified: mrbs/trunk/web/mrbs.css.php
===================================================================
--- mrbs/trunk/web/mrbs.css.php 2011-04-15 17:40:49 UTC (rev 1816)
+++ mrbs/trunk/web/mrbs.css.php 2011-04-15 17:55:40 UTC (rev 1817)
@@ -606,13 +606,14 @@
.form_general select#dur_units {margin-right: 1.0em; margin-left: 0.5em}
.form_general div#ad {float: left}
.form_general #ad label {clear: none; text-align: left; font-weight: normal}
-.form_general input#all_day {width: auto; margin-left: 3.0em; margin-right:
0.5em}
+.form_general input#all_day, .form_general input#area_def_duration_all_day
{width: auto; margin-left: 3.0em; margin-right: 0.5em}
.form_general #div_rooms select, .form_general #div_typematch select {float:
left; margin-right: 2.0em}
fieldset#rep_info {border-top: 1px solid <?php echo
$site_faq_entry_border_color ?>; padding-top: 0.7em}
.form_general input#rep_num_weeks {width: 2.0em}
.edit_area_room span.error {display: block; width: 100%; margin-bottom: 0.5em}
+.form_general label.secondary {font-weight: normal; width: auto}
/* ------------ EDIT_USERS.PHP ------------------*/
Modified: mrbs/trunk/web/systemdefaults.inc.php
===================================================================
--- mrbs/trunk/web/systemdefaults.inc.php 2011-04-15 17:40:49 UTC (rev
1816)
+++ mrbs/trunk/web/systemdefaults.inc.php 2011-04-15 17:55:40 UTC (rev
1817)
@@ -163,6 +163,11 @@
// Default duration - default length (in seconds) of a booking.
// Defaults to (60 * 60) seconds, i.e. an hour
$default_duration = (60 * 60); // DEFAULT VALUE FOR NEW AREAS
+// Whether the "All Day" checkbox should be checked by default. (Note
+// that even if this is set to true, $default_duration should still
+// be set as that is the duration that will be used when the All Day
+// checkbox is unchecked)
+$default_duration_all_day = FALSE; // DEFAULT VALUR FOR NEW AREAS
// Start and end of day.
// NOTE: The time between the beginning of the last and first
Added: mrbs/trunk/web/upgrade/27/mysql.sql
===================================================================
--- mrbs/trunk/web/upgrade/27/mysql.sql (rev 0)
+++ mrbs/trunk/web/upgrade/27/mysql.sql 2011-04-15 17:55:40 UTC (rev 1817)
@@ -0,0 +1,6 @@
+# $Id$
+
+# Add a column to record whether the all day box should be checked by default
+
+ALTER TABLE %DB_TBL_PREFIX%area
+ADD COLUMN default_duration_all_day tinyint(1) DEFAULT 0 NOT NULL AFTER
default_duration;
Property changes on: mrbs/trunk/web/upgrade/27/mysql.sql
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: mrbs/trunk/web/upgrade/27/pgsql.sql
===================================================================
--- mrbs/trunk/web/upgrade/27/pgsql.sql (rev 0)
+++ mrbs/trunk/web/upgrade/27/pgsql.sql 2011-04-15 17:55:40 UTC (rev 1817)
@@ -0,0 +1,7 @@
+-- $Id$
+
+-- Add a column to record whether the all day box should be checked by default
+
+ALTER TABLE %DB_TBL_PREFIX%area
+ADD COLUMN default_duration_all_day smallint DEFAULT 0 NOT NULL;
+
Property changes on: mrbs/trunk/web/upgrade/27/pgsql.sql
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
