frlan/simplekolecalc
0
0
Fork 0
forked from wtf-eg/simplekolecalc
Code Pull Requests Activity

Compare commits

merge into: frlan:main
Branches Tags
frlan:main
frlan:footer-mit-link-zu-repo
wtf-eg:main
wtf-eg:rules-2024
...
pull from: wtf-eg:main
Branches Tags
wtf-eg:main
wtf-eg:rules-2024
frlan:main
frlan:footer-mit-link-zu-repo

13 Commits
main ... main

Author SHA1 Message Date
Brain
75d204c2a1 Merge pull request 'fixes net-hotkey is in use for the application menu 'edit' in English browsers' (#4) from vv01f/simplekolecalc:vv01f-change-net-hotkey into main
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: wtf-eg/simplekolecalc#4
 2024-01-18 19:02:46 +01:00
Brain
a47b2da1da Merge pull request 'Apply new rules for 2024' (#6) from rules-2024 into main
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: wtf-eg/simplekolecalc#6
 2024-01-18 19:01:47 +01:00
Brain
90fd8e6a0c
Apply new rules effective 2024-01-01 2024-01-15 15:46:34 +01:00
srsh
0c594656d4 Merge pull request 'fix WTF Umlage percentage from 11.5% to 11%' (#5) from Helix/simplekolecalc:main into main
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: wtf-eg/simplekolecalc#5
 2024-01-14 16:38:29 +01:00
Helix
a1b1212ba5 fix WTF Umlage percentage from 11.5% to 11% 2024-01-14 16:36:55 +01:00
vv01f
bfead4bc67 change hotkey for net from 'e' to 't' 
chose 't' for the next best as 'e' is reserved in English browsers for edit
 2023-09-29 21:03:09 +02:00
vv01f
b0b2cf0725 Merge pull request 'update code from upstream' (#1) from wtf-eg/simplekolecalc:main into main 
Reviewed-on: vv01f/simplekolecalc#1
 2023-09-29 20:59:28 +02:00
Brain
1a46642434
Replace superscript 1 with HTML entity
All checks were successful
continuous-integration/drone/push Build is passing
Details
2023-09-28 16:27:39 +02:00
Brain
72e4359ab6 Merge pull request 'add footnote' (#3) from vv01f/simplekolecalc:vv01f-patch-entropyfee-timebase into main
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: wtf-eg/simplekolecalc#3
 2023-09-28 16:03:24 +02:00
vv01f
c727766eb3 xml entity for nnbsp 2023-09-28 13:40:24 +02:00
vv01f
535520e2e0 add footnote 
detail on time range for entropy fee
 2023-09-27 21:29:14 +02:00
Brain
301f1e6705 Merge pull request 'Add a link to source code to base of page' (#2) from frlan/simplekolecalc:footer-mit-link-zu-repo into main
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: wtf-eg/simplekolecalc#2
 2023-09-23 12:57:25 +02:00
Frank Lanitz
0bef44363c Add a link to source code to base of page 2023-09-23 12:56:00 +02:00
1 changed files with 29 additions and 15 deletions
Show Stats Expand all files Collapse all files

44
kole.html
View File

@ -49,6 +49,15 @@
text-align: center; text-align: center;
margin: 1ex auto 2ex auto; margin: 1ex auto 2ex auto;
} }
#center_footer {
display: flex;
align-items: center;
justify-content: center;
}
.footnotes {
margin-top: 1em;
font-size: 0.9em;
}
</style> </style>
</head> </head>
<body> <body>
@ -79,24 +88,24 @@
<input readonly="readonly" type="number" step="0.01" id="us" value="0.00"/>&thinsp;&euro; <input readonly="readonly" type="number" step="0.01" id="us" value="0.00"/>&thinsp;&euro;
</div> </div>
<div> <div>
<label for="n">N<u>e</u>tto</label> <label for="n">Ne<u>t</u>to</label>
<input accesskey="e" type="number" step="0.01" id="n" value="0.00"/>&thinsp;&euro; <input accesskey="t" type="number" step="0.01" id="n" value="0.00"/>&thinsp;&euro;
</div> </div>
<div> <div>
<label for="ec">Entropie-Tarif</label><!-- ggf. k&uuml;nftig Grundlage wie Handbuch/Dokumentation verlinken --> <label for="ec">Entropie-Tarif&#x202F;&sup1;</label><!-- ggf. k&uuml;nftig Grundlage wie Handbuch/Dokumentation verlinken -->
<select id="ec"> <select id="ec">
<option value="l" accesskey="l" name="low">Umsatz &leq; 1.000&nbsp;&euro;</option><!-- low: <=1 TEUR --> <option value="l" accesskey="l" name="low">Umsatz &leq; 15.000&nbsp;&euro;</option><!-- low: <=1 TEUR -->
<option value="h" accesskey="h" name="high">Umsatz &gt; 1.000&nbsp;&euro;</option><!-- high: >1 TEUR --> <option value="h" accesskey="h" name="high">Umsatz &gt; 15.000&nbsp;&euro;</option><!-- high: >1 TEUR -->
<option value="c" accesskey="c" name="custom">nach&nbsp;Vereinbarung</option><!-- custom: separate agreement --> <option value="c" accesskey="c" name="custom">nach&nbsp;Vereinbarung</option><!-- custom: separate agreement -->
</select> </select>
</div> </div>
<div> <div>
<label for="z">Entropieumlagesatz</label> <label for="z">Entropieumlagesatz</label>
<input type="number" step="0.01" id="z" value="23.00"/>&thinsp;% <input type="number" step="0.01" id="z" value="20.00"/>&thinsp;%
</div> </div>
<div> <div>
<label for="eu">Entropieumlage</label> <label for="eu">Entropieumlage</label>
<input readonly="readonly" type="number" step="0.01" id="eu" value="23.00"/>&thinsp;&euro; <input readonly="readonly" type="number" step="0.01" id="eu" value="20.00"/>&thinsp;&euro;
</div> </div>
<div> <div>
<label for="k">K<u>o</u>Le</label> <label for="k">K<u>o</u>Le</label>
@ -106,7 +115,9 @@
<section> <section>
<button accesskey="r" id="b" type="button">Be<u>r</u>echnen</button> <button accesskey="r" id="b" type="button">Be<u>r</u>echnen</button>
</section> </section>
<div class="footnotes">
&sup1;&#x202F;Es wird der monatliche Umsatz zugrunde gelegt.
</div>
</fieldset> </fieldset>
<script> <script>
@ -150,15 +161,15 @@
var selInd=this.selectedIndex; var selInd=this.selectedIndex;
console.log('Entropie-Tarif: '+selInd+'('+z.disabled+': '+z.value+')'); console.log('Entropie-Tarif: '+selInd+'('+z.disabled+': '+z.value+')');
switch(selInd){ switch(selInd){
case 0: //low: <1.000 EUR revenue case 0: //low: <15.000 EUR revenue
//23.0 % //20.0 %
z.value='23.00'; z.value='20.00';
z.disabled=true; z.disabled=true;
break;; break;;
case 1: //high: >1.000 EUR revenue case 1: //high: >15.000 EUR revenue
//11.5 % //15 %
z.disabled=true; z.disabled=true;
z.value='11.50'; z.value='15.0';
break;; break;;
case 2: //custom: according toseparate agreement case 2: //custom: according toseparate agreement
z.disabled=false; z.disabled=false;
@ -168,11 +179,14 @@
}); });
// set entropy tax to standard value // set entropy tax to standard value
c.selectedIndex=0; c.selectedIndex=0;
z.value='23.00'; z.value='20.00';
z.disabled=true; z.disabled=true;
// calc // calc
s.click(); s.click();
</script> </script>
<div id="center_footer">
<p>Der Quellcode befindet sich unter <a href="https://git.wtf-eg.de/wtf-eg/simplekolecalc">https://git.wtf-eg.de/wtf-eg/simplekolecalc</a>. </p>
</div>
</div> </div>
</body> </body>
</html> </html>