Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • fsini-informatik/fsfahrttool
  • kleemeis/fsfahrttool
2 results
Show changes
Showing
with 3882 additions and 1358 deletions
.debug{
display: none;
border: 1px dotted mediumvioletred;
}
.cost-anmerkung{
margin-top: 30px;
border-top: 1px dashed green;
padding: 15px;
background-color: greenyellow;
}
.pages-cost-edit{
border: 1px solid black;
background-color: lightcyan;
position: absolute;
top: 50px;
left: 50px;
padding: 15px;
}
.pages-cost-edit td{
border-right: 1px dotted darkgray;
padding: 3pt 5pt;
}
.deviderrow td{
border-top: 1px dotted darkgray;
}
.cost-table td{
border: 0;
}
.table-moneyio tr td{
vertical-align: top;
border: 0;
}
.table-moneyio-sum{
padding-right: 17px;
border-top: 1px dashed black !important;
border-bottom: 1px solid black !important;
}
.red-text{
color: red;
}
.green-text{
color: green;
}
.yellow-text{
color:#ffdd00;
}
/* === Buttons == */
.button-edit:before{
content: "";
background: url('../../view/graphics/jqueryui.png') no-repeat -68px -116px;
width: 9px;
height: 9px;
float: left;
margin: 2pt 4pt 0 0;
}
.button-delete:before{
content: "";
background: url('../../view/graphics/jqueryui.png') no-repeat -180px -100px;
width: 9px;
height: 10px;
float: left;
margin: 1.5pt 4pt 0 0;
}
.button-add:before{
content: "";
background: url('../../view/graphics/jqueryui.png') no-repeat -20px -133px;
width: 8px;
height: 8px;
float: left;
margin: 3pt 4pt 0 0;
}
.button-cancel:before{
content: "";
background: url('../../view/graphics/jqueryui.png') no-repeat -85px -133px;
width: 7px;
height: 7px;
float: left;
margin: 3.5pt 4pt 0 0;
}
.button-save:before{
content: "";
background: url('../../view/graphics/jqueryui.png') no-repeat -197px -100px;
width: 7px;
height: 9px;
float: left;
margin: 2.5pt 4pt 0 0;
}
.button-list:before{
content: "";
background: url('../../view/graphics/jqueryui.png') no-repeat -164px -131px;
width: 8px;
height: 11px;
float: left;
margin: 1.5pt 4pt 0 0;
}
.button-magnify:before{
content: "";
background: url('../../view/graphics/jqueryui.png') no-repeat -163px -116px;
width: 10px;
height: 9px;
float: left;
margin: 2pt 4pt 0 0;
}
/* == / end buttons == */
.tooltip {
position: absolute;
z-index: 1070;
display: block;
font-size: 12px;
line-height: 1.4;
visibility: visible;
filter: alpha(opacity=0);
opacity: 0;
}
.tooltip.in {
filter: alpha(opacity=90);
opacity: .9;
}
.tooltip.top {
padding: 5px 0;
margin-top: -3px;
}
.tooltip.right {
padding: 0 5px;
margin-left: 3px;
}
.tooltip.bottom {
padding: 5px 0;
margin-top: 3px;
}
.tooltip.left {
padding: 0 5px;
margin-left: -3px;
}
.tooltip-inner {
max-width: 200px;
padding: 3px 8px;
color: #fff;
text-align: center;
text-decoration: none;
background-color: #000;
border-radius: 4px;
}
.tooltip-arrow {
position: absolute;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
}
.tooltip.top .tooltip-arrow {
bottom: 0;
left: 50%;
margin-left: -5px;
border-width: 5px 5px 0;
border-top-color: #000;
}
.tooltip.top-left .tooltip-arrow {
bottom: 0;
left: 5px;
border-width: 5px 5px 0;
border-top-color: #000;
}
.tooltip.top-right .tooltip-arrow {
right: 5px;
bottom: 0;
border-width: 5px 5px 0;
border-top-color: #000;
}
.tooltip.right .tooltip-arrow {
top: 50%;
left: 0;
margin-top: -5px;
border-width: 5px 5px 5px 0;
border-right-color: #000;
}
.tooltip.left .tooltip-arrow {
top: 50%;
right: 0;
margin-top: -5px;
border-width: 5px 0 5px 5px;
border-left-color: #000;
}
.tooltip.bottom .tooltip-arrow {
top: 0;
left: 50%;
margin-left: -5px;
border-width: 0 5px 5px;
border-bottom-color: #000;
}
.tooltip.bottom-left .tooltip-arrow {
top: 0;
left: 5px;
border-width: 0 5px 5px;
border-bottom-color: #000;
}
.tooltip.bottom-right .tooltip-arrow {
top: 0;
right: 5px;
border-width: 0 5px 5px;
border-bottom-color: #000;
}
/* == END Tooltips ==
*/
.pages-cost-list{
position: fixed;
top:50px;
left: 50px;
width: 1000px;
height: 80%;
border: 1px solid #000000;
background-color: beige;
padding: 20px 10px 10px 10px;
}
.pages-cost-list-content{
display: block;
position:absolute;
height:auto;
bottom:0;
top:0;
left:0;
right:0;
overflow: auto;
padding: 10px;
margin: 20px 0 0 0;
}
.pages-cost-list-content ul li{
margin:0;
padding: 0;
}
.pages-cost-list-content td{
vertical-align: top;
border-bottom: 1px dotted darkgray;
}
.pages-cost-list-topbar {
background-color: #b0bed9;
height: 20px;
position: absolute;
top: 0;
left: 0;
right: 0;
padding: 0;
}
.pages-cost-list-topbar p{
position: absolute;
float: right;
top: 0;
padding: 0;
margin: 0;
right: 5px;
cursor: none;
height: 20px;
display: block;
}
\ No newline at end of file
This diff is collapsed.
<table class="cost-table">
<thead>
<tr>
<th>Position - {{io}}</th>
<th>Summe</th>
<th ng-show="tform.$visible"></th>
</tr>
</thead>
<tbody>
<!-- extra -->
<tr ng-repeat="(key,row) in extra">
<td>{{row.pos || "&nbsp;" }}</td>
<td class="cost-table-numeric">{{row.val || 0 | currency}}</td>
<td ng-show="tform.$visible"></td>
</tr>
<!-- editable stuff -->
<tr ng-repeat="row in col | filter:filterRow">
<td>
<span editable-text="row.pos" e-form="tableform" e-ng-change="chang(row, 'pos', $data)">
{{row.pos || "&nbsp;" }}
</span>
</td>
<td class="cost-table-numeric">
<span editable-text="row.val" e-form="tableform" e-style="width: 35pt" e-ng-change="chang(row, 'val', $data)">
{{row.val || 0 | currency}}
</span>
</td>
<td ng-show="tform.$visible" style="vertical-align: bottom;"><button type="button" ng-click="$parent.$parent.deleteRow(io,$index)" class="button-delete">del</button></td>
</tr>
</tbody>
</table>
<button type="button" ng-disabled="tform.$waiting" ng-show="tform.$visible" ng-click="$parent.addRow(col)" class="button-add">add row</button>
\ No newline at end of file
<form editable-form name="tableform" onaftersave="saveTable()" oncancel="cancel()" onshow="prepareForm()">
<table class="table-moneyio">
<tr>
<td>
<table-moneyio-col col="table.entries.in" extra="table.extra.in" io="in" tform="tableform"></table-moneyio-col>
</td>
<td>
<table-moneyio-col col="table.entries.out" extra="table.extra.out" io="out" tform="tableform"></table-moneyio-col>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td class="cost-table-numeric table-moneyio-sum">{{ moneyioDataService.colSum(table.entries.in, table.extra.in) | currency }}</td>
<td class="cost-table-numeric table-moneyio-sum">{{ moneyioDataService.colSum(table.entries.out, table.extra.out) | currency }}</td>
<td class="cost-table-numeric table-moneyio-sum" ng-class="{red:'red-text', yellow:'yellow-text', green: 'green-text'}[moneyioDataService.diffColor(table.extra)]" data-type="info" data-title="Differenz (Prognose)" bs-tooltip>{{ moneyioDataService.diff(table.extra) | currency }}</td>
<td class="cost-table-numeric table-moneyio-sum" ng-class="{red:'red-text', yellow:'yellow-text', green: 'green-text'}[moneyioDataService.diffRColor(table.extra)]" data-type="info" data-title="Differenz (Real)" bs-tooltip>{{ moneyioDataService.diffR(table.extra) | currency }}</td>
</tr>
</table>
<!-- buttons -->
<div class="btn-edit">
<button type="button" class="button-edit" ng-show="!tableform.$visible" ng-click="tableform.$show()">edit</button>
</div>
<div class="btn-form" ng-show="tableform.$visible">
<button type="submit" ng-disabled="tableform.$waiting" class="button-save">save</button> |
<button type="button" ng-disabled="tableform.$waiting" ng-click="tableform.$cancel()" class="button-cancel">cancel</button>
</div>
</form>
<div class="debug" style="margin-top: 30px;">
{{ table.entries || "&nbsp;" | json }}
</div>
<div class="debug" style="margin-top: 30px;">
{{ table.extra || "&nbsp;" | json }}
</div>
\ No newline at end of file
<div ng-show="table.editmode" class="pages-cost-edit">
<div style="float: left">
<table>
<thead>
<tr>
<th>&nbsp;</th>
<th>Tag 1</th>
<th>Tag 2</th>
<th>Tag 3</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="(key,row) in table.edit.VAR">
<td>{{table.bez[key]}}</td>
<td ng-repeat="col in row">
<input ng-model="col.val" type="input" name="{{key}}.val" />
<input ng-model="col.ind" type="checkbox" name="{{key}}.ind" data-placement="top-left" data-type="info" data-title="{{tooltip.ind.title}}" bs-tooltip />
<input ng-model="col.an" type="checkbox" name="{{key}}.an" data-placement="top-left" data-type="info" data-title="{{tooltip.an.title}}" bs-tooltip />
<input ng-model="col.ab" type="checkbox" name="{{key}}.ab" data-placement="top-left" data-type="info" data-title="{{tooltip.ab.title}}" bs-tooltip />
</td>
</tr>
<tr class="deviderrow"><td colspan="4"></td></tr>
<tr ng-repeat="(key,val) in table.edit.ALL">
<td>{{table.bez[key]}}</td>
<td colspan="3">
<input ng-model="val" type="text" name="{{key}}" ng-change="table.editUpdateAll(val,'{{key}}')" />
</td>
</tr>
<tr>
<td>(Vorkasse)</td>
<td colspan="3">
<input ng-model="table.amount" type="text" name="table.amount" />
</td>
</tr>
</tbody>
</table>
<button type="button" ng-click="table.saveTable()" class="button-save">save</button> |
<button type="button" ng-click="table.cancelTable()" class="button-cancel">cancel</button>
</div>
<div style="float: left; margin-left: 20px; width: 400px;">
<table-price-helper></table-price-helper>
</div>
<div style="clear: both"></div>
<div class="debug" style="margin-top: 30px;">
{{ table.edit | json }}
</div>
</div>
\ No newline at end of file
<h2 style="margin-top: 0">Hilfsrechner</h2>
Zu verteilende Posten wählen: <span ng-click="resetty(table.io)">[reset]</span><br />
<br />
IN:
<ul style="list-style: none;">
<li ng-repeat="entry in table.io.in">
<input type="checkbox" ng-model="entry.neg" data-placement="top-left" data-type="info" data-title="negative" bs-tooltip />
<label><input type="checkbox" ng-model="entry.selected" /> {{entry.pos}} ({{entry.val || 0 | currency}})</label>
</li>
</ul>
OUT:
<ul style="list-style: none;">
<li ng-repeat="entry in table.io.out">
<input type="checkbox" ng-model="entry.neg" data-placement="top-left" data-type="info" data-title="negative" bs-tooltip />
<label><input type="checkbox" ng-model="entry.selected" /> {{entry.pos}} ({{entry.val || 0 | currency}})</label>
</li>
</ul>
<label>Sontiges: <input type="text" style="width: 30pt" ng-model="special" /></label><br />
<br />
Einschränken auf:<br />
<label><input type="radio" ng-model="cnt" value="{{table.cnt.geman}}"> gemeinsam hin</label>
<label><input type="radio" ng-model="cnt" value="{{table.cnt.gemab}}"> gemeinsam rück</label><br />
<label><input type="radio" ng-model="cnt" value="{{table.cnt.all}}" ng-selected="{{table.cnt.all}}"> none</label><br />
<br />
Gewählte Summe: {{summy(table.io) || 0 | currency}}<br />
Anzahl Personen: {{cnt}} <br />
Betrag pro Person: {{meaner(table.io) || 0 | currency}}<br />
<!--<label><input type="radio" ng-model="round" value="{{table.round.up}}"> Aufrunden</label>
<label><input type="radio" ng-model="round" value="{{table.round.dwn}}" ng-selected="{{table.round.dwn}}"> Abrunden</label>-->
\ No newline at end of file
<div ng-show="table.listmode" class="pages-cost-list">
<div class="pages-cost-list-topbar"><p ng-click="table.toggleListmode()">X</p></div>
<div class="pages-cost-list-content">
<button type="button" ng-click="toggleDetails()" class="button-magnify">Details</button><br />
<br />
<div ng-repeat="(key,col) in table.list" style="float: left; width: 460px; border-right: 1px dashed #d3d3d3; padding: 10px 15px">
<h1>{{key}}</h1>
<table >
<thead>
<tr>
<th style="width: 30%; text-align: left;">Name + ID</th>
<th style="width: 70%; text-align: left;">Details</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="row in col">
<td>{{row.name}} ({{row.id}})</td>
<td>
<strong>{{row.pay.val || 0 | currency}}</strong> ({{row.pay.rval || 0 | currency}})<br />
{{row.person.von}} <br />
({{row.person.antyp}})<br />
{{row.person.bis}}<br />
({{row.person.abtyp}})<br />
<br />
<ul ng-repeat="entry in row.pay.pos" ng-show="showdetails">
<li>{{entry.pos}}: {{entry.val || 0 | currency}}</li>
</ul>
</td>
</tr>
</tbody>
</table>
</div>
<div class="debug" style="margin-top: 30px;">
{{ otherDataService.getPaymentList() | json }}
</div>
</div>
</div>
\ No newline at end of file
<table class="cost-table">
<thead>
<tr>
<th>Position</th>
<th>Anzahl (normal)</th>
<th>Satz (est)</th>
<th>Summe</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="row in dataService.calc">
<td>{{row.pos}}</td>
<td class="cost-table-numeric">{{row.cnt()}}</td>
<td class="cost-table-numeric">{{row.val() | currency}}</td>
<td class="cost-table-numeric">{{row.sum() | currency}}</td>
</tr>
<tr>
<td>(Vorkasse)</td>
<td></td>
<td></td>
<td>{{table.amount || 0 | currency}}</td>
</tr>
</tbody>
<tfoot>
<tr>
<td class="cost-table-invisible"></td>
<td class="cost-table-invisible"></td>
<td class="cost-table-invisible"></td>
<td>{{dataService.sum() | currency}}</td>
</tr>
</tfoot>
</table>
<button type="button" ng-click="table.editTable()" class="button-edit" ng-hide="table.editmode" >edit</button>
<table-price-edit></table-price-edit>
<button type="button" ng-click="table.listPay()" class="button-list" ng-hide="table.listmode">Liste</button>
<table-price-list></table-price-list>
<div class="debug" style="margin-top: 30px;">
{{ table.base || "&nbsp;" | json }}
</div>
<div class="debug" style="margin-top: 30px;">
{{ dataService.base || "&nbsp;" | json }}
</div>
\ No newline at end of file
<form editable-form name="tableform" onaftersave="saveTable()" oncancel="cancel()" onshow="prepareForm()">
<table class="cost-table" id="">
<thead>
<tr>
<th>Position</th>
<th>Menge</th>
<th>Anzahl</th>
<th>Satz</th>
<th>Summe</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="row in table.entries | filter:filterRow">
<td>
<span editable-text="row.pos" e-form="tableform" e-ng-change="chang($index, 'pos', $data)">
{{ row.pos || '&nbsp;' }}
</span>
</td>
<td class="cost-table-numeric" >
<span editable-text="row.cnt" e-form="tableform" e-style="width: 20pt" e-ng-change="chang($index, 'cnt', $data)">
{{ row.cnt || 1 }}
</span>
</td>
<td class="cost-table-numeric" >
<span editable-text="row.mul" e-form="tableform" e-style="width: 20pt" e-ng-change="chang($index, 'mul', $data)">
{{ row.mul || 1 }}
</span>
</td>
<td class="cost-table-numeric" >
<span editable-text="row.price" e-form="tableform" e-style="width: 30pt" e-ng-change="chang($index, 'price', $data)">
{{ row.price || 0 | currency}}
</span>
</td>
<td class="cost-table-numeric" >{{ dataService.rowSum(row) | currency}}</td>
<td><button type="button" ng-show="tableform.$visible" ng-click="deleteRow($index)" class="button-delete">del</button></td>
</tr>
</tbody>
<tfoot>
<tr>
<td class="cost-table-invisible"></td>
<td class="cost-table-invisible"></td>
<td class="cost-table-invisible"></td>
<td class="cost-table-invisible"></td>
<td>{{dataService.sum() | currency}}</td>
<td></td>
</tr>
</tfoot>
</table>
<!-- buttons -->
<div class="btn-edit">
<button type="button" class="button-edit" ng-show="!tableform.$visible" ng-click="tableform.$show()">edit</button>
</div>
<div class="btn-form" ng-show="tableform.$visible">
<button type="button" ng-disabled="tableform.$waiting" ng-click="addRow()" class="button-add">add row</button> |
<button type="submit" ng-disabled="tableform.$waiting" class="button-save">save</button> |
<button type="button" ng-disabled="tableform.$waiting" ng-click="tableform.$cancel()" class="button-cancel">cancel</button>
</div>
</form>
<div class="debug" style="margin-top: 30px;">
{{ table.entries || "&nbsp;" | json }}
</div>
<div class="debug" style="margin-top: 30px;">
{{ dataService.entries || "&nbsp;" | json }}
</div>
\ No newline at end of file
<form editable-form name="tableform" onaftersave="saveTable()" oncancel="cancel()" onshow="prepareForm()">
<table class="cost-table">
<thead>
<tr>
<th>Position</th>
<th>Anzahl</th>
<th>Satz</th>
<th>Summe</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="row in table.entries | filter:filterRow">
<td>
<span editable-text="row.pos" e-form="tableform" e-ng-change="chang($index, 'pos', $data)">
{{ row.pos || '&nbsp;' }}
</span>
</td>
<td class="cost-table-numeric">
<span editable-text="row.cnt" e-form="tableform" e-style="width: 20pt" e-ng-change="chang($index, 'cnt', $data)">
{{ row.cnt || 1 }}
</span>
</td>
<td class="cost-table-numeric">
<span editable-text="row.price" e-form="tableform" e-style="width: 30pt" e-ng-change="chang($index, 'price', $data)">
{{row.price || 0 | currency}}
</span>
</td>
<td class="cost-table-numeric">{{dataService.rowSum(row) | currency}}</td>
<td><button type="button" ng-show="tableform.$visible" ng-click="deleteRow($index)" class="button-delete">del</button></td>
</tr>
</tbody>
<tfoot>
<tr>
<td class="cost-table-invisible"></td>
<td class="cost-table-invisible"></td>
<td class="cost-table-invisible"></td>
<td>{{dataService.sum() | currency}}</td>
<td></td>
</tr>
</tfoot>
</table>
<!-- buttons -->
<div class="btn-edit">
<button type="button" class="button-edit" ng-show="!tableform.$visible" ng-click="tableform.$show()">edit</button>
</div>
<div class="btn-form" ng-show="tableform.$visible">
<button type="button" ng-disabled="tableform.$waiting" ng-click="addRow()" class="button-add">add row</button> |
<button type="submit" ng-disabled="tableform.$waiting" class="button-save">save</button> |
<button type="button" ng-disabled="tableform.$waiting" ng-click="tableform.$cancel()" class="button-cancel">cancel</button>
</div>
</form>
<div class="debug" style="margin-top: 30px;">
{{ table.entries || "&nbsp;" | json }}
</div>
<div class="debug" style="margin-top: 30px;">
{{ dataService.entries || "&nbsp;" | json }}
</div>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.