CSS and logic updates
This commit is contained in:
L_DA
parent
52f3f359af
commit
c000c8f7b7
5 changed files with 297 additions and 78 deletions
|
|
@ -20,44 +20,76 @@
|
|||
{{#periods}}
|
||||
<tr sstyle="border:1px black; padding-top:0rem; padding-bottom:0rem">
|
||||
<td>
|
||||
<a href="javascript:;" style="color: black;" data-container="body" data-toggle="popover" data-placement="top" data-html="true" data-content="Beginn: {{starttime}} Uhr<br/>Ende: {{endtime}} Uhr" title="{{starttime}}-{{endtime}}">
|
||||
<a href="javascript:;" style="color: black;" data-container="body" data-toggle="popover" data-placement="top" data-html="true" data-content="{{number}}. Stunde<br/>Beginn: {{starttime}} Uhr<br/>Ende: {{endtime}} Uhr" title="{{starttime}}-{{endtime}}">
|
||||
{{number}}
|
||||
<div class="time" id="{{id}}">{{starttime}}-{{endtime}}</div>
|
||||
</a></td>
|
||||
{{#days}}
|
||||
<td style="padding-top:0rem; padding-bottom:0rem; vertical-align:middle; border-left:1px black;" {{#substitutionolddd}}bgcolor="pink" data-toggle='tooltip' title='{{substitutionold}}'{{/substitutionolddd}}>
|
||||
<td style="padding-top:0rem; padding-bottom:0rem; vertical-align:middle; border-left:1px black;">
|
||||
{{#lessons}}
|
||||
<div class="lesson" style="padding:2pt; {{#substitution}}border-color:red; boder-width:2px; border-style:solid; background-color:pink;{{/substitution}} {{#cancel}}font-weight:bold; background-color:red; text-decoration:line-through;{{/cancel}}{{#text}} background-color:pink;{{/text}}">
|
||||
<a href="javascript:;" style="color:{{#cancel}}white{{/cancel}}{{^cancel}}black{{/cancel}};" data-container="body" data-toggle="popover" data-placement="top" data-html="true" data-content="Fach: {{subject}},<br/>Lehrer: {{teacher}},<br/>Klasse: {{class}},</br>Raum: {{room}}</br>
|
||||
{{#cancel}} entfällt.{{/cancel}}{{#substitution}} statt: {{subjecta}}, {{teachera}}, {{classa}}, {{rooma}}{{/substitution}}{{#text}}<br><b>Hinweis: {{text}}</b>{{/text}}" title="{{#cancel}}Stunde entfällt{{/cancel}}{{#substitution}}Stundenänderung{{/substitution}}{{#event}} Event / Sonderplan{{/event}}">
|
||||
{{#event}}{{text}}{{/event}}
|
||||
<div class="subject">
|
||||
{{#subjecta}}<span style="background-color:red; color:white; font-weight:bold;">{{/subjecta}} {{subject}} {{#substitution}}{{#subjecta}}</span>{{/subjecta}}
|
||||
<span style="font-size:6pt">
|
||||
{{#classa}}<span style="background-color:red; color:white; font-weight:bold;">{{/classa}} {{class}} {{#classa}}</span>{{/classa}},
|
||||
{{#teachera}}<span style="background-color:red; color:white; font-weight:bold;">{{/teachera}} {{teacher}} {{#teachera}}</span>{{/teachera}},
|
||||
{{#rooma}}<span style="background-color:red; color:white; font-weight:bold;">{{/rooma}} {{room}} {{#rooma}}</span>{{/rooma}}
|
||||
</span>{{/substitution}}</div>
|
||||
<div class="class">
|
||||
{{#classa}}<span style="background-color:red; color:white; font-weight:bold;">{{/classa}} {{class}} {{#substitution}}{{#classa}}</span>{{/classa}}
|
||||
<span style="font-size:6pt">
|
||||
{{#subjecta}}<span style="background-color:red; color:white; font-weight:bold;">{{/subjecta}} {{subject}} {{#subjecta}}</span>{{/subjecta}},
|
||||
{{#teachera}}<span style="background-color:red; color:white; font-weight:bold;">{{/teachera}} {{teacher}} {{#teachera}}</span>{{/teachera}},
|
||||
{{#rooma}}<span style="background-color:red; color:white; font-weight:bold;">{{/rooma}} {{room}} {{#rooma}}</span>{{/rooma}}
|
||||
</span>{{/substitution}}</div>
|
||||
<div class="teacher">
|
||||
{{#teachera}}<span style="background-color:red; color:white; font-weight:bold;">{{/teachera}} {{teacher}} {{#substitution}}{{#teachera}}</span>{{/teachera}}
|
||||
<span style="font-size:6pt">
|
||||
{{#subjecta}}<span style="background-color:red; color:white; font-weight:bold;">{{/subjecta}} {{subject}} {{#subjecta}}</span>{{/subjecta}},
|
||||
{{#classa}}<span style="background-color:red; color:white; font-weight:bold;">{{/classa}} {{class}} {{#classa}}</span>{{/classa}}
|
||||
{{#rooma}}<span style="background-color:red; color:white; font-weight:bold;">{{/rooma}} {{room}} {{#rooma}}</span>{{/rooma}}
|
||||
</span>{{/substitution}}</div>
|
||||
<div class="room">
|
||||
{{#rooma}}<span style="background-color:red; color:white; font-weight:bold;">{{/rooma}} {{room}} {{#substitution}}{{#rooma}}</span>{{/rooma}}
|
||||
<span style="font-size:6pt">
|
||||
{{#subjecta}}<span style="background-color:red; color:white; font-weight:bold;">{{/subjecta}} {{subject}} {{#subjecta}}</span>{{/subjecta}},
|
||||
{{#classa}}<span style="background-color:red; color:white; font-weight:bold;">{{/classa}} {{class}} {{#classa}}</span>{{/classa}}
|
||||
{{#teachera}}<span style="background-color:red; color:white; font-weight:bold;">{{/teachera}} {{teacher}} {{#teachera}}</span>{{/teachera}},
|
||||
</span>{{/substitution}}</div>
|
||||
<div class="lesson {{#substitution}}substitution{{/substitution}} {{cancel4me}} {{#subtype}}subtype_{{.}} {{/subtype}}">
|
||||
<a href="javascript:;" data-container="body" data-toggle="popover" data-placement="top" data-html="true"
|
||||
data-content="Fach: {{subject}}
|
||||
{{#subjectchanged}}
|
||||
{{#cancel}}{{#subjectb}} wird ersetzt durch {{subjectb}}{{/subjectb}}{{^subjectb}} entfällt{{/subjectb}}{{/cancel}}
|
||||
{{^cancel}}{{#subjecta}} statt {{subjecta}}{{/subjecta}}{{/cancel}}
|
||||
{{/subjectchanged}},<br/>
|
||||
Lehrer: {{teacher}}
|
||||
{{#teacherchanged}}
|
||||
{{#cancel}}{{#teacherb}} wird ersetzt durch {{teacherb}}{{/teacherb}}{{^teacherb}} entfällt{{/teacherb}}{{/cancel}}
|
||||
{{^cancel}}{{#teachera}} statt {{teachera}}{{/teachera}}{{/cancel}}
|
||||
{{/teacherchanged}},<br/>
|
||||
Klasse: {{class}}
|
||||
{{#classchanged}}
|
||||
{{#cancel}}{{#classb}} wird ersetzt durch {{classb}}{{/classb}}{{^classb}} entfällt{{/classb}}{{/cancel}}
|
||||
{{^cancel}}{{#classa}} statt {{classa}}{{/classa}}{{/cancel}}
|
||||
{{/classchanged}},<br/>
|
||||
Raum: {{room}}
|
||||
{{#roomchanged}}
|
||||
{{#cancel}}{{#roomb}} wird ersetzt durch {{roomb}}{{/roomb}}{{^roomb}} entfällt{{/roomb}}{{/cancel}}
|
||||
{{^cancel}}{{#rooma}} statt {{rooma}}{{/rooma}}{{/cancel}}
|
||||
{{/roomchanged}},<br/>
|
||||
<!-- {{#cancel}} entfällt.
|
||||
{{^subjectb}}<br>{{subject}} entfällt{{/subjectb}}
|
||||
{{^teacherb}}<br>{{teacher}} entfällt{{/teacherb}}
|
||||
{{^roomb}}<br>{{room}} entfällt{{/roomb}}
|
||||
{{^classb}}<br>{{class}} entfällt{{/classb}}
|
||||
{{/cancel}}
|
||||
{{^cancel}}
|
||||
{{#substitution}} statt:
|
||||
{{#subjecta}}{{subjecta}}, {{/subjecta}}
|
||||
{{#teachera}}{{teachera}}, {{/teachera}}
|
||||
{{#classa}}{{classa}}, {{/classa}}
|
||||
{{#rooma}}{{rooma}} {{/rooma}}
|
||||
{{/substitution}}
|
||||
{{/cancel}}
|
||||
-->
|
||||
{{#text}}
|
||||
<br><b>Hinweis: {{text}}</b>
|
||||
{{/text}}"
|
||||
title="{{#cancel}}Stunde entfällt / {{/cancel}}{{#substitution}}Stundenänderung{{/substitution}}{{#event}} Event / Sonderplan{{/event}}">
|
||||
{{#viewteacher}}
|
||||
<div class="lesson_main {{#subjectchanged}}changed{{/subjectchanged}} {{#cancel}}canceled{{/cancel}}">{{subject}}</div>
|
||||
<div class="lesson_details {{#cancel}}canceled{{/cancel}} {{#substitution}}substitution{{/substitution}}" id="{{id}}">
|
||||
<span class="lesson_detail {{#classchanged}}changed{{/classchanged}}" id="class">{{class}}</span>
|
||||
<span class="lesson_detail {{#roomchanged}}changed{{/roomchanged}}" id="room">{{room}}</span>
|
||||
</div>
|
||||
{{/viewteacher}}
|
||||
{{#viewclass}}
|
||||
<div class="lesson_main {{#subjectchanged}}changed{{/subjectchanged}} {{#cancel}}canceled{{/cancel}}">{{subject}}</div>
|
||||
<div class="lesson_details {{#cancel}}canceled{{/cancel}} {{#substitution}}substitution{{/substitution}}" id="{{id}}">
|
||||
<span class="lesson_detail {{#teacherchanged}}changed{{/teacherchanged}}" id="teacher">{{teacher}}</span>
|
||||
<span class="lesson_detail {{#roomchanged}}changed{{/roomchanged}}" id="room">{{room}}</span>
|
||||
</div>
|
||||
{{/viewclass}}
|
||||
{{#viewroom}}
|
||||
<div class="lesson_main {{#classa}}changed{{/classa}} {{#cancel}}canceled{{/cancel}}">{{class}}</div>
|
||||
<div class="lesson_details {{#cancel}}canceled{{/cancel}} {{#substitution}}substitution{{/substitution}}" id="{{id}}">
|
||||
<span class="lesson_detail {{#teacherchanged}}changed{{/teacherchanged}}" id="teacher">{{teacher}}</span>
|
||||
<span class="lesson_detail {{#roomchanged}}changed{{/roomchanged}}" id="room">{{room}}</span>
|
||||
</div>
|
||||
{{/viewroom}}
|
||||
{{#text}}<div class="lesson_txt">{{text}}</div>{{/text}}
|
||||
</a>
|
||||
</div>
|
||||
{{/lessons}}
|
||||
|
|
@ -66,23 +98,10 @@
|
|||
</tr>
|
||||
{{/periods}}
|
||||
</table>
|
||||
<br>
|
||||
<a href="javascript:;" class="block_timetable_detail_show" id="{{id}}">{{#pix}}i/show, core, Details anzeigen{{/pix}}Details anzeigen</a>
|
||||
<a href="javascript:;" class="block_timetable_detail_hide" id="{{id}}" style="display:none;">{{#pix}}i/hide, core, Details verbergen{{/pix}}Details verbergen</a>
|
||||
</div>
|
||||
|
||||
<div class="timetable_legend" sssstyle="text-align:left; width:100%; align:center;">
|
||||
<a href="javascript:;" class="block_timetable_select" data-type="class">{{#pix}}i/show, core, Klassen anzeigen{{/pix}}Klassen</a><br>
|
||||
<a href="javascript:;" class="block_timetable_select" data-type="teacher">{{#pix}}i/hide, core, Lehrer ausblenden{{/pix}}Lehrer</a><br>
|
||||
<a href="javascript:;" class="block_timetable_select" data-type="subject">{{#pix}}i/show, core, Fächer anzeigen{{/pix}}Fächer</a><br>
|
||||
<a href="javascript:;" class="block_timetable_select" data-type="room">{{#pix}}i/show, core, Räume anzeigen{{/pix}}Räume</a><br>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="timetable_legend" style="text-align:center; width:100%; align:center; display: none;">
|
||||
<a href="javascript:;" class="block_timetable_select" data-type="class">Klassen</a> -
|
||||
<a href="javascript:;" class="block_timetable_select" data-type="teacher">Lehrer</a> -
|
||||
<a href="javascript:;" class="block_timetable_select" data-type="subject">Fächer</a> -
|
||||
<a href="javascript:;" class="block_timetable_select" data-type="room">Räume</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
{{# js }}
|
||||
require([
|
||||
|
|
@ -128,6 +147,24 @@ require([
|
|||
$(".block_timetable_select").click(function() {
|
||||
select_type($(event.target).data('type'));
|
||||
});
|
||||
$(".block_timetable_detail_show").click(function(event) {
|
||||
//$(".lesson_detail").show();
|
||||
var id = event.currentTarget.id;
|
||||
$("#"+id+".lesson_details").css({"display":"inline"});
|
||||
$("#"+id+".time").css({"display":"block"});
|
||||
//$("#"+id+".lesson_details").show();
|
||||
$("#"+id+".block_timetable_detail_show").hide();
|
||||
$("#"+id+".block_timetable_detail_hide").show();
|
||||
});
|
||||
$(".block_timetable_detail_hide").click(function(event) {
|
||||
//$(".lesson_detail").hide();
|
||||
var id = event.currentTarget.id;
|
||||
$("#"+id+".lesson_details").css({"display":"none"});
|
||||
$("#"+id+".time").css({"display":"none"});
|
||||
//$("#"+id+".lesson_details").hide();
|
||||
$("#"+id+".block_timetable_detail_show").show();
|
||||
$("#"+id+".block_timetable_detail_hide").hide();
|
||||
});
|
||||
|
||||
if (typeof block_timetable_type !== 'undefined') {
|
||||
console.log("block_timetable_type found:"+block_timetable_type);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue