summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-31 11:18:52 +0100
committerSebastian Wagner2011-10-31 11:18:52 +0100
commit71c258dc1be03d07339a8d3cc39d5ef2100daf03 (patch)
tree46b131ee158364adce40104906981e4c05d7bf57 /application
parentminor (diff)
downloadpoolctrl-71c258dc1be03d07339a8d3cc39d5ef2100daf03.tar.gz
poolctrl-71c258dc1be03d07339a8d3cc39d5ef2100daf03.tar.xz
poolctrl-71c258dc1be03d07339a8d3cc39d5ef2100daf03.zip
some bug fixes
Diffstat (limited to 'application')
-rwxr-xr-xapplication/layouts/default.phtml3
-rwxr-xr-xapplication/models/EventMapper.php8
-rwxr-xr-xapplication/views/scripts/event/index.phtml140
3 files changed, 50 insertions, 101 deletions
diff --git a/application/layouts/default.phtml b/application/layouts/default.phtml
index c8d0793..3921210 100755
--- a/application/layouts/default.phtml
+++ b/application/layouts/default.phtml
@@ -22,7 +22,6 @@ echo $this->headScript()."\n";
src='/media/js/jquery-ui-timepicker-addon.js'></script>
<script type="text/javascript" src='/media/js/script.js'></script>
<!-- files for calendar -->
-<!-- <script type='text/javascript' src='/media/js/fullcalendar.min.js'></script> -->
<script type='text/javascript' src='/media/js/fullcalendar.js'></script>
<script type="text/javascript"
src='/media/js/jquery.qtip-1.0.0-rc3.min.js'></script>
@@ -58,7 +57,7 @@ echo $this->headScript()."\n";
<li id='statisticsTree'>
<ul class='navTreeLevel1'>
<li class='navTreeItem'><a href='/statistics/category'>Category</a></li>
- <!-- li class='navTreeItem'><a href='/statistics/running'>Running</a></li> -->
+ <li class='navTreeItem'><a href='/statistics/running'>Running</a></li>
<li class='navTreeItem'><a href='/statistics/success'>Success</a></li>
<li class='navTreeItem'><a href='/statistics/type'>Type</a></li>
</ul>
diff --git a/application/models/EventMapper.php b/application/models/EventMapper.php
index d4f6b5c..9545380 100755
--- a/application/models/EventMapper.php
+++ b/application/models/EventMapper.php
@@ -267,7 +267,7 @@ class Application_Model_EventMapper
$select = $this->getDbTable()->select()
->setIntegrityCheck(false)
->from(array('pce' => 'poolctrl_event'),
- array('count1' => 'SUM(IF(pce.running=1,1,0))', 'count0' => 'SUM(IF(pce.running=1,0,1))')
+ array('not_over' => 'SUM(pce.running = 1 OR pce.running = 0)', 'over' => 'SUM(pce.running = 2 OR pce.running = 3)')
)
->join(array('pcec' => 'poolctrl_eventcategory'),
'pce.category = pcec.eventcategoryID',
@@ -277,7 +277,7 @@ class Application_Model_EventMapper
$select = $this->getDbTable()->select()
->setIntegrityCheck(false)
->from(array('pce' => 'poolctrl_event'),
- array('over' => 'SUM(IF(pce.running=1,1,0))', 'not_over' => 'SUM(IF(pce.running=1,0,1))')
+ array('not_over' => 'SUM(pce.running = 1 OR pce.running = 0)', 'over' => 'SUM(pce.running = 2 OR pce.running = 3)')
)
->join(array('pcec' => 'poolctrl_eventcategory'),
'pce.category = pcec.eventcategoryID',
@@ -288,8 +288,8 @@ class Application_Model_EventMapper
$result = $stmt->fetchAll(PDO::FETCH_NUM);
foreach ($result as $r) {
- $ret1 = array((int)$r[0],'over');
- $ret2 = array((int)$r[1],'not over');
+ $ret1 = array((int)$r[0],'not over');
+ $ret2 = array((int)$r[1],'over');
$return[] = array($ret1,$ret2);
}
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 4443730..d939039 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -35,33 +35,32 @@ var poolIDtmp;
// dayClick
var dayClick = false;
-
-// change border color of an event
- function eventSelected(event) {
- if (eventColor.ev != null){
- event.selected = false;
- selectedEvent = null;
- eventColor.ev.borderColor = eventColor.color;
- }
- event.selected = true;
- selectedEvent = event;
- eventColor.ev = event;
- eventColor.color = event.borderColor;
- event.borderColor = 'black';
- $('#calendar').fullCalendar("rerenderEvents");
- if($.get("/event/checkright/rightShortcut/er")){
- $('#eventReportButton').show();
-
- } else {
- $('#eventReportButton').hide();
-
- }
- if($.get("/event/checkright/rightShortcut/ee")) {
- $('#editEvent').show();
- } else {
- $('#editEvent').hide();
- }
- }
+//change border color of an event
+function eventSelected(event) {
+ if (eventColor.ev != null){
+ event.selected = false;
+ selectedEvent = null;
+ eventColor.ev.borderColor = eventColor.color;
+ }
+ event.selected = true;
+ selectedEvent = event;
+ eventColor.ev = event;
+ eventColor.color = event.borderColor;
+ event.borderColor = 'black';
+ $('#calendar').fullCalendar("rerenderEvents");
+ if($.get("/event/checkright/rightShortcut/er")){
+ $('#eventReportButton').show();
+
+ } else {
+ $('#eventReportButton').hide();
+
+ }
+ if($.get("/event/checkright/rightShortcut/ee")) {
+ $('#editEvent').show();
+ } else {
+ $('#editEvent').hide();
+ }
+}
// change view to addEvent
function addEvent() {
@@ -177,27 +176,12 @@ var dayClick = false;
});
$( "#eventDeleteWdhDialog" ).dialog('open');}
}
- //copy selected event by key ctrl(17) AND c(67)
- /* 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');
- cpEventDuration = cpEvent.minuteDelta;
- alert(cpEventDuration);
- //cut selected event by key ctrl(17) AND x(88)
- } else if (e.ctrlKey && e.keyCode == 88 && selectedEvent.selected == true) {
-
- //paste selected event by key ctrl(17) AND v(86)
- } else if (e.ctrlKey && e.keyCode == 86 && selectedEvent.selected == true && cpEvent != null && selectedDate != null) {
- alert(cpEvent.title + " paste to " + selectedDate);
- self.location="/event/add/evstart/" + selectedDate + "/evend" +
- $('#calendar').fullCalendar( 'removeEvents', selectedEvent.id );
- $('#calendar').fullCalendar( 'rerenderEvents' );
- }*/
-
});
-// initialize fullCalendar
+/*
+ * initialize fullCalendar and all calendar-functions
+ */
+
function iniCalendar() {
var calendar = $('#calendar').fullCalendar({
@@ -223,50 +207,7 @@ var dayClick = false;
loading: function(bool) { if (bool) $('#progress').show(); else $('#progress').hide(); },
- /*
- dayClick: function( date, allDay, jsEvent, view ) {
-
- selectedDate = date;
- dayClick = true;
- $('#calendar').fullCalendar( 'unselect' );
-
- if($("#poolselectbox option:selected").val() == 'default') {
- $( "#noPoolSelectedDialog" ).dialog('open');
- } else if ($.get("/event/checkright/rightShortcut/ec") && evClick == false) {
- $(function() {
- $( "#eventAddDialog" ).dialog({
- autoOpen: false,
- width: 600,
- modal: true,
- title: "Add Event from " + date,
- buttons: {
- "Cancel": function() {
- dayClick = false;
- $(this).dialog("close");
- $('#calendar').fullCalendar( 'unselect' );
- },
- "OK": function() {
- $(this).dialog("close");
- self.location="/event/add/evstart/" + date + "/poolID/" + $("#poolselectbox option:selected").val();
- }
- },
- open: function () {
- $(".ui-dialog-titlebar-close").hide();
- //$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
- }
- });
- });
- $( "#eventAddDialog" ).dialog('open');
- } else if (evClick == false) {
- dayClick = false;
- $('#calendar').fullCalendar( 'unselect' );
- $( "#errorRightsDialog" ).dialog('open');
- }
- else $('#calendar').fullCalendar( 'unselect' );
-
- //self.location="/event/add/evstart/" + date + "/poolID/" + $("#poolselectbox option:selected").val();
- },*/
-
+
eventMouseover: function( event, jsEvent, view ) {
evClick = true;
},
@@ -798,6 +739,11 @@ var dayClick = false;
}
}
});
+
+
+ /*
+ * Button definitions
+ */
// EventType Buttons
$('.fc-header-center').append('<span id="lecture" class="fc-button fc-state-default fc-corner-right fc-state-active"><span class="fc-button-inner"><span class="fc-button-content">Lecture</span><span class="fc-button-effect"><span></span></span></span></span>');
@@ -933,7 +879,11 @@ var dayClick = false;
}
-// initialize errorRights Dialog
+/*
+ * Initialisation of Dialogs
+ */
+
+// errorRights Dialog
$(function() {
$( "#errorRightsDialog" ).dialog({
autoOpen: false,
@@ -952,7 +902,7 @@ var dayClick = false;
});
});
-// initialize noPoolSelected Dialog
+// noPoolSelected Dialog
$(function() {
$( "#noPoolSelectedDialog" ).dialog({
autoOpen: false,
@@ -971,7 +921,7 @@ var dayClick = false;
});
});
-// initialize errorEditImmediate Dialog
+// errorEditImmediate Dialog
$(function() {
$( "#errorEditImmediate" ).dialog({
autoOpen: false,
@@ -990,7 +940,7 @@ var dayClick = false;
});
});
-//initialize errorTime Dialog
+// errorTime Dialog
$(function() {
$( "#errorTimeDialog" ).dialog({
autoOpen: false,
@@ -1009,7 +959,7 @@ var dayClick = false;
});
});
-//initialize formularOverlappingDialog Dialog
+// formularOverlappingDialog Dialog
$(function() {
$( "#formularOverlappingDialog" ).dialog({
autoOpen: false,