KumiSystems/moodle-local_mycerts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change a way of displaying date ranges on the edit element page (#185)

Browse source
This commit is contained in:
Dmitrii Metelkin 2018-07-27 10:59:01 +10:00 committed by Mark Nelson
parent b26e8c92b9
commit 19d0bf5dc8
3 changed files with 48 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
element/daterange/classes/element.php
View file

@ -119,44 +119,52 @@ class element extends \mod_customcert\element {
for ($i = 0; $i < $maxranges; $i++) { for ($i = 0; $i < $maxranges; $i++) {
$datarange = array(); $datarange = array();
$datarange[] = $mform->createElement( $mform->addElement('static',
'date_selector', $this->build_element_name('group', $i),
$this->build_element_name('startdate', $i), get_string('daterange', 'customcertelement_daterange', $i + 1),
get_string('start', 'customcertelement_daterange') ''
); );
$datarange[] = $mform->createElement( $mform->addElement(
'date_selector',
$this->build_element_name('enddate', $i),
get_string('end', 'customcertelement_daterange')
);
$datarange[] = $mform->createElement(
'text',
$this->build_element_name('datestring', $i),
get_string('datestring', 'customcertelement_daterange')
);
$datarange[] = $mform->createElement(
'checkbox',
$this->build_element_name('recurring', $i),
get_string('recurring', 'customcertelement_daterange')
);
$datarange[] = $mform->createElement(
'checkbox', 'checkbox',
$this->build_element_name('enabled', $i), $this->build_element_name('enabled', $i),
get_string('enable') get_string('enable')
); );
$mform->setType($this->build_element_name('enabled', $i), PARAM_BOOL);
$mform->addElement( $mform->addElement(
'group', 'date_selector',
$this->build_element_name('group', $i), $this->build_element_name('startdate', $i),
get_string('daterange', 'customcertelement_daterange', $i + 1), get_string('start', 'customcertelement_daterange')
$datarange, '', false); );
$mform->setType($this->build_element_name('startdate', $i), PARAM_INT);
$mform->disabledIf($this->build_element_name('group', $i), $this->build_element_name('enabled', $i), 'notchecked'); $mform->addElement(
'date_selector',
$this->build_element_name('enddate', $i),
get_string('end', 'customcertelement_daterange')
);
$mform->setType($this->build_element_name('enddate', $i), PARAM_INT);
$mform->addElement(
'checkbox',
$this->build_element_name('recurring', $i),
get_string('recurring', 'customcertelement_daterange')
);
$mform->setType($this->build_element_name('recurring', $i), PARAM_BOOL);
$mform->addElement(
'text',
$this->build_element_name('datestring', $i),
get_string('datestring', 'customcertelement_daterange'),
['class' => 'datestring']
);
$mform->setType($this->build_element_name('datestring', $i), PARAM_NOTAGS); $mform->setType($this->build_element_name('datestring', $i), PARAM_NOTAGS);
$mform->disabledIf($this->build_element_name('startdate', $i), $this->build_element_name('enabled', $i), 'notchecked');
$mform->disabledIf($this->build_element_name('enddate', $i), $this->build_element_name('enabled', $i), 'notchecked');
$mform->disabledIf($this->build_element_name('recurring', $i), $this->build_element_name('enabled', $i), 'notchecked');
$mform->disabledIf($this->build_element_name('datestring', $i), $this->build_element_name('enabled', $i), 'notchecked');
} }
} }
@ -201,13 +209,11 @@ class element extends \mod_customcert\element {
} }
foreach ($this->get_decoded_data()->dateranges as $key => $range) { foreach ($this->get_decoded_data()->dateranges as $key => $range) {
$groupelement = $mform->getElement($this->build_element_name('group', $key)); $mform->setDefault($this->build_element_name('startdate', $key), $range->startdate);
$groupelements = $groupelement->getElements(); $mform->setDefault($this->build_element_name('enddate', $key), $range->enddate);
$mform->setDefault($groupelements[0]->getName(), $range->startdate); $mform->setDefault($this->build_element_name('datestring', $key), $range->datestring);
$mform->setDefault($groupelements[1]->getName(), $range->enddate); $mform->setDefault($this->build_element_name('recurring', $key), $range->recurring);
$mform->setDefault($groupelements[2]->getName(), $range->datestring); $mform->setDefault($this->build_element_name('enabled', $key), $range->enabled);
$mform->setDefault($groupelements[3]->getName(), $range->recurring);
$mform->setDefault($groupelements[4]->getName(), $range->enabled);
} }
} }
@ -241,7 +247,8 @@ class element extends \mod_customcert\element {
$enabled = $this->build_element_name('enabled', $i); $enabled = $this->build_element_name('enabled', $i);
$datestring = $this->build_element_name('datestring', $i); $datestring = $this->build_element_name('datestring', $i);
if (!empty($data[$enabled]) && empty($data[$datestring])) { if (!empty($data[$enabled]) && empty($data[$datestring])) {
$errors[$this->build_element_name('group', $i)] = get_string('error:datestring', 'customcertelement_daterange'); $name = $this->build_element_name('datestring', $i);
$errors[$name] = get_string('error:datestring', 'customcertelement_daterange');
} }
} }
@ -252,7 +259,7 @@ class element extends \mod_customcert\element {
$enddate = $this->build_element_name('enddate', $i); $enddate = $this->build_element_name('enddate', $i);
if (!empty($data[$enabled]) && $data[$startdate] >= $data[$enddate] ) { if (!empty($data[$enabled]) && $data[$startdate] >= $data[$enddate] ) {
$errors[$this->build_element_name('group', $i)] = get_string('error:enddate', 'customcertelement_daterange'); $errors[$this->build_element_name('enddate', $i)] = get_string('error:enddate', 'customcertelement_daterange');
} }
} }

2
element/daterange/lang/en/customcertelement_daterange.php
View file

@ -41,7 +41,7 @@ $string['pluginname'] = 'Date range';
$string['privacy:metadata'] = 'The Date range plugin does not store any personal data.'; $string['privacy:metadata'] = 'The Date range plugin does not store any personal data.';
$string['start'] = 'Start'; $string['start'] = 'Start';
$string['end'] = 'End'; $string['end'] = 'End';
$string['datestring'] = 'String representation'; $string['datestring'] = 'String';
$string['daterange'] = 'Daterange {$a}'; $string['daterange'] = 'Daterange {$a}';
$string['error:enabled'] = 'You must have at least one datarange enabled'; $string['error:enabled'] = 'You must have at least one datarange enabled';
$string['error:datestring'] = 'You must provide string representation for the enabled datarange'; $string['error:datestring'] = 'You must provide string representation for the enabled datarange';

3
element/daterange/styles.css Normal file
View file

@ -0,0 +1,3 @@
.datestring {
padding-bottom: 1.5rem!important;
}