summaryrefslogtreecommitdiffstats
path: root/application/views
diff options
context:
space:
mode:
Diffstat (limited to 'application/views')
-rwxr-xr-xapplication/views/scripts/event/add.phtml10
-rwxr-xr-xapplication/views/scripts/event/index.phtml11
2 files changed, 10 insertions, 11 deletions
diff --git a/application/views/scripts/event/add.phtml b/application/views/scripts/event/add.phtml
index f42597f..0e05ea4 100755
--- a/application/views/scripts/event/add.phtml
+++ b/application/views/scripts/event/add.phtml
@@ -30,11 +30,19 @@ if(isset($this->params['add'])) {
?>
$(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
@@ -45,4 +53,4 @@ if(isset($this->params['add'])) {
ampm: true
});
});
-</script> \ No newline at end of file
+</script>
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index acbca58..caa5e4b 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -466,8 +466,6 @@ var dayClick = false;
$.post("/event/eventresize/evid/" + event.id + "/evend/" + event.end + "/poolID/" + $("#poolselectbox option:selected").val());
} else {
$(this).dialog("close");
- cell.removeChild(cell.firstChild);
- $("#conflicts").append(returndata.withoutrepeat);
$( "#eventNotDroppableDialog2" ).dialog('open');
}
}
@@ -498,10 +496,6 @@ var dayClick = false;
event.repeat = 2;
} else {
$(this).dialog("close");
- cell.removeChild(cell.firstChild);
- cfcell.removeChild(cfcell.firstChild);
- $("#cfevents").append(returndata.cfplotwithoutrepeat);
- $("#conflicts").append(returndata.withoutrepeat);
$( "#eventNotDroppableDialog2" ).dialog('open');
}
},
@@ -624,8 +618,6 @@ var dayClick = false;
}
} else {
$(this).dialog("close");
- cell.removeChild(cell.firstChild);
- $("#conflicts").append(returndata.withoutrepeat);
$( "#eventNotDroppableDialog2" ).dialog('open');
}
}
@@ -662,8 +654,6 @@ var dayClick = false;
event.repeat = 2;
} else {
$(this).dialog("close");
- cell.removeChild(cell.firstChild);
- $("#conflicts").append(returndata.withoutrepeat);
$( "#eventNotDroppableDialog2" ).dialog('open');
}
},
@@ -1091,6 +1081,7 @@ between two events.</p>
<!-- errorTime -->
<div id="errorTimeDialog" style="display: none">
+<p>One or more Events have been droped in the past.</p>
<p>Please select a date in the future!</p>
</div>