2.3.0.1 - minor fix in templates\nsoon date format can be chosen
parent
4b3d713c3d
commit
1d4ec3d765
|
@ -989,13 +989,13 @@
|
||||||
<p class="c4"><span class="c8">Vom</span></p>
|
<p class="c4"><span class="c8">Vom</span></p>
|
||||||
</td>
|
</td>
|
||||||
<td class="c33" colspan="1" rowspan="1">
|
<td class="c33" colspan="1" rowspan="1">
|
||||||
<p class="c4"><span>26/02/2018</span></p>
|
<p class="c4"><span>{{week.start}}</span></p>
|
||||||
</td>
|
</td>
|
||||||
<td class="c51" colspan="1" rowspan="1">
|
<td class="c51" colspan="1" rowspan="1">
|
||||||
<p class="c4"><span class="c8">bis</span></p>
|
<p class="c4"><span class="c8">bis</span></p>
|
||||||
</td>
|
</td>
|
||||||
<td class="c21" colspan="1" rowspan="1">
|
<td class="c21" colspan="1" rowspan="1">
|
||||||
<p class="c4"><span>02/03/2018</span></p>
|
<p class="c4"><span>{{week.end}}</span></p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="c48">
|
<tr class="c48">
|
||||||
|
|
|
@ -989,13 +989,13 @@
|
||||||
<p class="c4"><span class="c8">Vom</span></p>
|
<p class="c4"><span class="c8">Vom</span></p>
|
||||||
</td>
|
</td>
|
||||||
<td class="c33" colspan="1" rowspan="1">
|
<td class="c33" colspan="1" rowspan="1">
|
||||||
<p class="c4"><span>26/02/2018</span></p>
|
<p class="c4"><span>{{week.start}}</span></p>
|
||||||
</td>
|
</td>
|
||||||
<td class="c51" colspan="1" rowspan="1">
|
<td class="c51" colspan="1" rowspan="1">
|
||||||
<p class="c4"><span class="c8">bis</span></p>
|
<p class="c4"><span class="c8">bis</span></p>
|
||||||
</td>
|
</td>
|
||||||
<td class="c21" colspan="1" rowspan="1">
|
<td class="c21" colspan="1" rowspan="1">
|
||||||
<p class="c4"><span>02/03/2018</span></p>
|
<p class="c4"><span>{{week.end}}</span></p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="c48">
|
<tr class="c48">
|
||||||
|
|
|
@ -85,8 +85,13 @@ export class Modi_Week{
|
||||||
}
|
}
|
||||||
|
|
||||||
for(var w in weeks){
|
for(var w in weeks){
|
||||||
weeks[w].start = moment(weeks[w].start).add(-1, "days").format('YYYY-MM-DD');
|
if(choosenTemplate != "wochenbericht"){
|
||||||
weeks[w].end = moment(moment(weeks[w].start).day(7)).format('YYYY-MM-DD');
|
weeks[w].start = moment(weeks[w].start).add(-1, "days").format('DD/MM/YYYY');
|
||||||
|
weeks[w].end = moment(moment(weeks[w].start).day(7)).format('DD/MM/YYYY');
|
||||||
|
}else{
|
||||||
|
weeks[w].start = moment(weeks[w].start).add(-1, "days").format('YYYY-MM-DD');
|
||||||
|
weeks[w].end = moment(moment(weeks[w].start).day(7)).format('YYYY-MM-DD');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
for(d in weeks[w].data){
|
for(d in weeks[w].data){
|
||||||
|
|
Loading…
Reference in New Issue