summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-27 08:51:16 +0200
committerSebastian Wagner2011-10-27 08:51:16 +0200
commit8cd8188ac8bf7a9af40df8f328b3562c748b65ca (patch)
treef200c5fcf454c153ded4a20960d5242489b1ecf4
parentminor die zweite (diff)
downloadpoolctrl-8cd8188ac8bf7a9af40df8f328b3562c748b65ca.tar.gz
poolctrl-8cd8188ac8bf7a9af40df8f328b3562c748b65ca.tar.xz
poolctrl-8cd8188ac8bf7a9af40df8f328b3562c748b65ca.zip
some bug fixed
-rwxr-xr-xapplication/views/scripts/event/edit.phtml8
-rwxr-xr-xapplication/views/scripts/event/getpoollist.phtml2
-rwxr-xr-xapplication/views/scripts/event/index.phtml14
3 files changed, 16 insertions, 8 deletions
diff --git a/application/views/scripts/event/edit.phtml b/application/views/scripts/event/edit.phtml
index 81aca58..673682f 100755
--- a/application/views/scripts/event/edit.phtml
+++ b/application/views/scripts/event/edit.phtml
@@ -19,11 +19,19 @@ echo '<script type="text/javascript">
bootosfieldChanged("pbs_bootosID", bootosIDs);
$(function() {
$("#start").datetimepicker({
+ onSelect: function (selectedDateTime){
+ var start = $(this).datetimepicker("getDate");
+ $("#end").datetimepicker("option", "minDate", new Date(start.getTime()));
+ },
dateFormat: "mm/dd/yy",
timeFormat: "hh:mm tt",
ampm: true
});
$("#end").datetimepicker({
+ onSelect: function (selectedDateTime){
+ var end = $(this).datetimepicker("getDate");
+ $("#start").datetimepicker("option", "maxDate", new Date(end.getTime()) );
+ },
dateFormat: "mm/dd/yy",
timeFormat: "hh:mm tt",
ampm: true
diff --git a/application/views/scripts/event/getpoollist.phtml b/application/views/scripts/event/getpoollist.phtml
index 1e64e21..4e37257 100755
--- a/application/views/scripts/event/getpoollist.phtml
+++ b/application/views/scripts/event/getpoollist.phtml
@@ -1,6 +1,6 @@
<?php
if(count($this->poollist) == 0){
- echo "<option>no pool</option>";
+ echo "<option id='noPool'>no pool</option>";
}
foreach($this->poollist as $p){
if(isset($this->poolID) && $this->poolID == $p->getID()) {
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 1e7f754..9e75fbe 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -60,7 +60,7 @@ var dayClick = false;
// change view to addEvent
function addEvent() {
- if($("#poolselectbox option:selected").val() == 'default') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
$("#noPoolSelectedDialog").dialog('open');
} else {
self.location="/event/add/";}
@@ -340,7 +340,7 @@ var dayClick = false;
// get conflicts
var returndata = jQuery.parseJSON(data);
- if($("#poolselectbox option:selected").val() == 'default') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else if ($.get("/event/checkright/rightShortcut/ec") && evClick == false) {
$(function() {
@@ -795,7 +795,7 @@ var dayClick = false;
$('.fc-header-center').append('<span id="shutdown" class="fc-button fc-state-default fc-corner-right fc-state-active"><span class="fc-button-inner"><span class="fc-button-content">Shutdown</span><span class="fc-button-effect"><span></span></span></span></span>');
// PoolSelectBox
- $('.fc-header-left').append('<form name="PoolSelectForm"><select id="poolselectbox" name="PoolSelectbox" onclick="setPoolIDtmp()" onChange="fetchPoolEvents();"><option value="default" >Please choose a Pool</option></select></form>');
+ $('.fc-header-left').append('<form name="PoolSelectForm"><select id="poolselectbox" name="PoolSelectbox" onclick="setPoolIDtmp()" onChange="fetchPoolEvents();"><option value="defaultPool" >Please choose a Pool</option></select></form>');
// Add Button
$('.fc-header-right').append('<span id="addEvent" class="fc-button fc-state-default fc-state-hover"><span class="fc-button-inner"><span class="fc-button-content">+</span><span class="fc-button-effect"><span></span></span></span></span>');
@@ -808,7 +808,7 @@ var dayClick = false;
// Change Button-Style
$("#lecture").click(function(){
- if($("#poolselectbox option:selected").val() == 'default') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {
@@ -818,7 +818,7 @@ var dayClick = false;
}
});
$("#maintenance").click(function(){
- if($("#poolselectbox option:selected").val() == 'default') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {
@@ -828,7 +828,7 @@ var dayClick = false;
}
});
$("#boot").click(function(){
- if($("#poolselectbox option:selected").val() == 'default') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {
@@ -838,7 +838,7 @@ var dayClick = false;
}
});
$("#shutdown").click(function(){
- if($("#poolselectbox option:selected").val() == 'default') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {