From e642b6702c90a776e3281b6de965eb5615d32015 Mon Sep 17 00:00:00 2001 From: L_DA Date: Sun, 13 Sep 2020 21:07:32 +0200 Subject: [PATCH] CSS und Templates --- classes/timetable.php | 4 ++- externallib.php | 25 +++++++++++-- templates/searchform.mustache | 4 +-- templates/searchresult.mustache | 20 +++++++---- templates/timetable.mustache | 64 ++++++++++++++++++++++++--------- version.php | 2 +- 6 files changed, 90 insertions(+), 29 deletions(-) diff --git a/classes/timetable.php b/classes/timetable.php index 119dd4f..67598e8 100755 --- a/classes/timetable.php +++ b/classes/timetable.php @@ -266,10 +266,12 @@ class timetable { $mylesson['flag'] = ""; if ($lesson->flag) $mylesson['flag'] = $lesson->flag; + /* if ($this->type == 'class') $mylesson['class'] = ""; if ($this->type == 'teacher') $mylesson['teacher'] = ""; if ($this->type == 'room') $mylesson['room'] = ""; - $days[$day]['lessons'][] = $mylesson; + */ + if ($lesson->week[$this->week-1] != '0') $days[$day]['lessons'][] = $mylesson; /* - für diese Woche wurden keine Daten ausgegeben 0 in dieser Woche findet der Unterricht nicht statt diff --git a/externallib.php b/externallib.php index e65d54f..a80dc9f 100644 --- a/externallib.php +++ b/externallib.php @@ -57,6 +57,7 @@ class mod_timetable_external extends external_api { throw new moodle_exception('cannotviewprofile'); } + $results = array(); //return $params['searchstring'] . $USER->firstname ; $classes = $DB->get_records_select('timetable_class', 'class like ? OR description like ? LIMIT 10', array ('%'.$params['searchstring'].'%', '%'.$params['searchstring'].'%')); @@ -142,18 +143,38 @@ class mod_timetable_external extends external_api { $context = get_context_instance(CONTEXT_USER, $USER->id); self::validate_context($context); + //$contextmodule = context_module::instance($cm->id); + $usercontext = context_user::instance($USER->id); + + //Capability checking //OPTIONAL but in most web service it should present - if (!has_capability('moodle/user:viewdetails', $context)) { - throw new moodle_exception('cannotviewprofile'); + if (!has_capability('mod/timetable:view_'.$params['type'], $usercontext)) { + if (!(($params['type'] == 'class') && has_capability('mod/timetable:view_own_class', $usercontext) && ($params['name'] == str_replace('_','/',$USER->department)))) + throw new \moodle_exception('cannotviewtimetable'.$params['type']); } + /* + if ($USER->department == "Lehrer" || $USER->department == "Lehrer_fvs") { + + } elseif (($params['type'] == 'class') && ($params['name'] == str_replace('_','/',$USER->department))) { + + } else { + throw new \moodle_exeption('Forbidden'); + } + */ + + //echo "Type: ".$params['type']."\n"; //echo "Name: ".$params['name']."\n"; //echo "Week: ".$params['week']."\n"; if(!($params['week'])) { $today = new \DateTime(); $params['week'] = $today->format("W"); + $dayofweek = $today->format('w'); + if ($dayofweek > 5 + get_config('timetable', 'saturday')) { + $params['week']++; + } } $ttable = new \mod_timetable\timetable($params['type'],$params['name']); diff --git a/templates/searchform.mustache b/templates/searchform.mustache index e072ca7..73d1523 100644 --- a/templates/searchform.mustache +++ b/templates/searchform.mustache @@ -1,7 +1,7 @@ -
+
Suche Stundenplan:
-
+
diff --git a/templates/searchresult.mustache b/templates/searchresult.mustache index 4b270a0..49ff2f4 100644 --- a/templates/searchresult.mustache +++ b/templates/searchresult.mustache @@ -1,7 +1,8 @@
{{^searchresults}}Keine Treffer{{/searchresults}} @@ -20,9 +21,8 @@ require([ if (add=='1') { promises[0].done(function(response) { - console.log('mod_timetable/get is' + response); templates.render('mod_timetable/timetable',response).done(function(html, js) { - $('.timetable').last().after(html); + $('.timetables').append(html); templates.runTemplateJS(js); }).fail(notification.exception); }).fail(function(ex) { @@ -30,9 +30,11 @@ require([ }); } else { promises[0].done(function(response) { - console.log('mod_timetable/get is' + response); templates.render('mod_timetable/timetable',response).done(function(html, js) { - $('.timetable').first().replaceWith(html); + if (!($('.timetables .timetable').length)) { + $('.timetables').prepend("
"); + } + $('.timetables .timetable').first().replaceWith(html); templates.runTemplateJS(js); }).fail(notification.exception); }).fail(function(ex) { @@ -44,7 +46,13 @@ require([ $(".searchresults").click(function() { - load_timetable($(event.target).data('type'),$(event.target).data('name'),$(event.target).data('add')); + console.log($(event.target)); + element = $(event.target); + while (!(element.is('a'))) { + element = element.parent(); + } + console.log(element); + load_timetable(element.data('type'),element.data('name'),element.data('add')); }); }); {{/ js }} diff --git a/templates/timetable.mustache b/templates/timetable.mustache index f46103b..3cd0fdc 100644 --- a/templates/timetable.mustache +++ b/templates/timetable.mustache @@ -1,10 +1,10 @@ -
-
-{{description}} -x +
+
+{{description}} +{{#pix}}e/cancel, core, Stundenplan schließen{{/pix}}
-
- +
+
- - - - - - - -{{#saturday}} - -{{/saturday}} + + +{{#saturday}}{{/saturday}} + {{#periods}} - + {{#days}}
◄ @@ -12,19 +12,13 @@ ►
MoDiMiDoFrSamstag
MoDiMiDoFrSa
{{number}} @@ -49,6 +43,22 @@ {{/periods}}
+ +
+ {{#pix}}i/show, core, Klassen anzeigen{{/pix}}Klassen
+ {{#pix}}i/hide, core, Lehrer ausblenden{{/pix}}Lehrer
+ {{#pix}}i/show, core, Fächer anzeigen{{/pix}}Fächer
+ {{#pix}}i/show, core, Räume anzeigen{{/pix}}Räume
+
+ + + +
{{# js }} require([ @@ -75,6 +85,15 @@ require([ }); } + function select_type(type) { + $(".subject").hide(); + $(".class").hide(); + $(".teacher").hide(); + $(".room").hide(); + $("."+type).show(); + block_timetable_type = type; + } + //alert("Hi, this is a test"); $(".nextweek").click(function() { load_timetable($(event.target).data('type'), $(event.target).data('name'), $(event.target).data('week'), $(event.target).data('id')); //.parentNode.parentNode.parentNode.parentNode); @@ -82,5 +101,16 @@ require([ $(".prevweek").click(function() { load_timetable($(event.target).data('type'), $(event.target).data('name'), $(event.target).data('week'), $(event.target).data('id')); //.parentNode.parentNode.parentNode); }); + $(".block_timetable_select").click(function() { + select_type($(event.target).data('type')); + }); + + if (typeof block_timetable_type !== 'undefined') { + console.log("block_timetable_type found:"+block_timetable_type); + select_type(block_timetable_type); + } else { + select_type('subject'); + } + }); {{/ js }} diff --git a/version.php b/version.php index d801dcc..7bd5d27 100644 --- a/version.php +++ b/version.php @@ -26,6 +26,6 @@ defined('MOODLE_INTERNAL') || die(); $plugin->component = 'mod_timetable'; $plugin->release = '0.1.0'; -$plugin->version = 2020083003; +$plugin->version = 2020083004; $plugin->requires = 2020061500; $plugin->maturity = MATURITY_ALPHA;