summaryrefslogtreecommitdiffstats
path: root/application/views/scripts
diff options
context:
space:
mode:
authorsebastian wagner2011-09-12 15:33:54 +0200
committersebastian wagner2011-09-12 15:33:54 +0200
commitf4e3bf3580f8e66de3d58beb57173e6fc20a9bf1 (patch)
tree659607821d78c7aec798e51a995841871e964b63 /application/views/scripts
parentgetpoolselectboxval (diff)
downloadpoolctrl-f4e3bf3580f8e66de3d58beb57173e6fc20a9bf1.tar.gz
poolctrl-f4e3bf3580f8e66de3d58beb57173e6fc20a9bf1.tar.xz
poolctrl-f4e3bf3580f8e66de3d58beb57173e6fc20a9bf1.zip
bug fix
Diffstat (limited to 'application/views/scripts')
-rwxr-xr-xapplication/views/scripts/event/index.phtml40
1 files changed, 25 insertions, 15 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index e00e045..9c1b2a5 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -41,11 +41,12 @@ var clickTmp = true;
// change view to addEvent
function addEvent() {
- if($("#poolselectbox option:selected").val() == 'Please choose a Pool') {
+ if($("#poolselectbox option:selected").val() == 'default') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
- self.location="/event/add/";}
+ self.location="/event/add/" }
}
+ //poolSelectBoxVal/" + $("#poolselectbox option:selected").val();
function showCalendar() {
$("#calendar").show();
@@ -140,7 +141,7 @@ var clickTmp = true;
});
$( "#eventDeleteWdhDialog" ).dialog('open');}
//copy selected event by key ctrl(17) AND c(67)
- } else if (e.ctrlKey && e.keyCode == 67 && selectedEvent.selected == true) {
+ }/* else if (e.ctrlKey && e.keyCode == 67 && selectedEvent.selected == true) {
cpEvent = selectedEvent;
//cpEventStart = $.fullCalendar.formatDate(selectedEvent.start, 'hh:mm');
//cpEventEnd = $.fullCalendar.formatDate(selectedEvent.end, 'hh:mm');
@@ -155,7 +156,7 @@ var clickTmp = true;
self.location="/event/add/evstart/" + selectedDate + "/evend" +
$('#calendar').fullCalendar( 'removeEvents', selectedEvent.id );
$('#calendar').fullCalendar( 'rerenderEvents' );
- }
+ }*/
});
@@ -169,7 +170,7 @@ var clickTmp = true;
default: 'week',
left: 'title',
center: 'prev,next today',
- right: 'agendaWeek,agendaDay'
+ right: 'month, agendaWeek,agendaDay'
},
// set some default options
@@ -209,13 +210,13 @@ var clickTmp = true;
setTimeout(function() {clickTmp = true} , 300);
eventSelected(event);
} else {
- self.location = "/event/edit/eventID/" + event.id;
+ self.location = "/event/edit/eventID/" + event.id + "/poolID/" + $("#poolselectbox option:selected").val();
}
},
select: function( startDate, endDate, allDay, jsEvent, view ) {
- if($("#poolselectbox option:selected").val() == 'Please choose a Pool') {
+ if($("#poolselectbox option:selected").val() == 'default') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
$(function() {
@@ -231,7 +232,7 @@ var clickTmp = true;
},
"OK": function() {
$(this).dialog("close");
- self.location="/event/add/evstart/" + startDate + "/evend/" + endDate;
+ self.location="/event/add/evstart/" + startDate + "/evend/" + endDate + "/poolID/" + $("#poolselectbox option:selected").val();
}
},
open: function () {
@@ -310,7 +311,7 @@ var clickTmp = true;
}
// the event is no boot- or shutdown-Event, apply the changes
- else $.post("/event/eventresize/evid/" + event.id + "/evend/" + event.end);
+ else $.post("/event/eventresize/evid/" + event.id + "/evend/" + event.end + "/poolID/" + $("#poolselectbox option:selected").val());
}
},
open: function () {
@@ -434,14 +435,14 @@ var clickTmp = true;
$('.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" onChange="fetchPoolEvents(this); "><option>Please choose a Pool</option></select></form>');
+ $('.fc-header-left').append('<form name="PoolSelectForm"><select id="poolselectbox" name="PoolSelectbox" onChange="fetchPoolEvents(this); "><option value="default" >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">Add Event</span><span class="fc-button-effect"><span></span></span></span></span>');
// Change Button-Style
$("#lecture").click(function(){
- if($("#poolselectbox option:selected").val() == 'Please choose a Pool') {
+ if($("#poolselectbox option:selected").val() == 'default') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {
@@ -451,7 +452,7 @@ var clickTmp = true;
}
});
$("#maintenance").click(function(){
- if($("#poolselectbox option:selected").val() == 'Please choose a Pool') {
+ if($("#poolselectbox option:selected").val() == 'default') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {
@@ -461,7 +462,7 @@ var clickTmp = true;
}
});
$("#boot").click(function(){
- if($("#poolselectbox option:selected").val() == 'Please choose a Pool') {
+ if($("#poolselectbox option:selected").val() == 'default') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {
@@ -471,7 +472,7 @@ var clickTmp = true;
}
});
$("#shutdown").click(function(){
- if($("#poolselectbox option:selected").val() == 'Please choose a Pool') {
+ if($("#poolselectbox option:selected").val() == 'default') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {
@@ -505,10 +506,19 @@ var clickTmp = true;
});
//fetch poollist from pbs database
- $.get("/event/getpoollist/", function(getpoollistresult){$("#poolselectbox").append(getpoollistresult);});
+ $.get("/event/getpoollist/", function(getpoollistresult){$("#poolselectbox").append(getpoollistresult);}); //$("#poolselectbox").val(setPoolSelectBoxVal());
+
+ //fetch poolSelectBoxVal
}
+ /*function setPoolSelectBoxVal() {
+ var poolID = $.get("/event/getpoolselectboxval/");
+ //alert(poolID);
+ $('#calendar').fullCalendar("removeEvents");
+ $('#calendar').fullCalendar("addEventSource", "/event/eventlist/poolID/" + poolID);
+ return poolID;
+ }*/