summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-08 15:50:37 +0200
committerBjörn Geiger2011-09-08 15:50:37 +0200
commit38a8fa5d4db0d0d6c2d937c842216892ea78334b (patch)
treec8ccb2fa54c12eb557a5a4cb872adce2afcea00b
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-38a8fa5d4db0d0d6c2d937c842216892ea78334b.tar.gz
poolctrl-38a8fa5d4db0d0d6c2d937c842216892ea78334b.tar.xz
poolctrl-38a8fa5d4db0d0d6c2d937c842216892ea78334b.zip
weiteres
-rw-r--r--application/forms/EventAdd.php5
-rw-r--r--application/forms/EventEdit.php9
-rw-r--r--public/media/js/script.js27
3 files changed, 32 insertions, 9 deletions
diff --git a/application/forms/EventAdd.php b/application/forms/EventAdd.php
index 9f0a78d..8d10686 100644
--- a/application/forms/EventAdd.php
+++ b/application/forms/EventAdd.php
@@ -96,7 +96,7 @@ class Application_Form_EventAdd extends Zend_Form
}
$eventcategoryfield->setRegisterInArrayValidator(false);
- $eventcategoryfield->setAttrib('onchange', "eventcategoryfieldChanged('category');");
+ $eventcategoryfield->setAttrib('onchange', "addeventcategoryfieldChanged('category');");
if(isset($this->defaultEventCategoryID)) {
$eventcategoryfield->setValue($this->defaultEventCategoryID);
}
@@ -214,8 +214,7 @@ class Application_Form_EventAdd extends Zend_Form
));
echo '<script type="text/javascript">
- repeatChanged("repeat");
- eventcategoryfieldChanged("category");
+ addeventcategoryfieldChanged("category");
$(function() {
$("#start").datetimepicker();
$("#end").datetimepicker();
diff --git a/application/forms/EventEdit.php b/application/forms/EventEdit.php
index 826bcfd..6b9f29b 100644
--- a/application/forms/EventEdit.php
+++ b/application/forms/EventEdit.php
@@ -71,7 +71,7 @@ class Application_Form_EventEdit extends Zend_Form
$eventcategoryfield->setRegisterInArrayValidator(false);
$eventcategoryfield->setValue($this->params['category']);
- $eventcategoryfield->setAttrib('onchange', "eventcategoryfieldChanged('category');");
+ $eventcategoryfield->setAttrib('onchange', "editeventcategoryfieldChanged('category');");
$this->addElement($eventcategoryfield);
$this->addElement('text', 'title', array(
@@ -183,7 +183,7 @@ class Application_Form_EventEdit extends Zend_Form
array('StringLength', false, array(0, 4)),
),
'required' => false,
- 'label' => 'Participants:',
+ 'label' => 'ParticipantsrepeatChanged("repeat");:',
'value' => $this->params['participants'],
));
@@ -197,7 +197,7 @@ class Application_Form_EventEdit extends Zend_Form
}
$eventcategoryfield->setRegisterInArrayValidator(false);
- $eventcategoryfield->setValue( $this->params['category']);
+ $eventcategoryfield->setValue( $this->paramFs['category']);
$this->addElement($eventcategoryfield);
$this->addElement('text', 'note', array(
@@ -250,8 +250,7 @@ class Application_Form_EventEdit extends Zend_Form
));
echo '<script type="text/javascript">
- repeatChanged("repeat");
- eventcategoryfieldChanged("category");
+ editeventcategoryfieldChanged("category");
$(function() {
$("#start").datetimepicker();
$("#end").datetimepicker();
diff --git a/public/media/js/script.js b/public/media/js/script.js
index 3b61562..696bac8 100644
--- a/public/media/js/script.js
+++ b/public/media/js/script.js
@@ -101,7 +101,7 @@ function repeatChanged(name) {
}
}
-function eventcategoryfieldChanged(name) {
+function addeventcategoryfieldChanged(name) {
option = $('#' + name + ' option[value="' + getElementValue(name) + '"]');
label = option.attr('label');
startLabel = $('#start-label');
@@ -125,4 +125,29 @@ function eventcategoryfieldChanged(name) {
startLabel.children().text('Start:');
}
repeatChanged('repeat');
+}
+
+function editeventcategoryfieldChanged(name) {
+ option = $('#' + name + ' option[value="' + getElementValue(name) + '"]');
+ label = option.attr('label');
+ startLabel = $('#start-label');
+ if (label == 'Boot' || label == 'Shutdown') {
+ setElementInvisible("end-label");
+ setElementInvisible("end-element");
+ disableElement('end');
+ removeElementAttribute('repeat', 'checked');
+ startLabel.children().text('Date:');
+ } else if (label == 'Lecture') {
+ setElementVisible("end-label");
+ setElementVisible("end-element");
+ enableElement('end');
+ startLabel.children().text('Start:');
+ } else {
+ setElementVisible("end-label");
+ setElementVisible("end-element");
+ enableElement('end');
+ removeElementAttribute('repeat', 'checked');
+ startLabel.children().text('Start:');
+ }
+ repeatChanged('repeat');
} \ No newline at end of file