FSFE/fsfe-website
30
33
Fork 96
Code Issues 65 Pull Requests 15 Wiki Activity

PD and RC form with activities (#4812)
continuous-integration/drone/push Build is passing
Details

Browse Source 
Co-authored-by: Tobias Diekershoff <tobiasd@fsfe.org>
Co-committed-by: Tobias Diekershoff <tobiasd@fsfe.org>
This commit was merged in pull request #4812.
This commit is contained in:
tobiasd
2025-02-03 07:18:30 +00:00
committed by tobiasd
parent 57c469d0e3
commit c8efa11cce
7 changed files with 162 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fsfe.org/internal/internal.css
+15
View File
@@ -38,3 +38,18 @@ input[type="file"] {
label {
font-weight: normal;
}
#category {
width: auto !important;
padding: inherit !important;
background: none !important;
margin-top: 0px !important;
}
#content input[type="radio"] {
margin: 0 0 0 -20px;
}
#description-help {
font-size: 0.8em;
color: #616161be;
}
fsfe.org/internal/pd.en.xhtml
+25 -35
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<html>
<version>1</version>
<version>2</version>
<head>
<title>Per Diem / VKP statement</title>
@@ -40,7 +40,7 @@
know whether a certain day counts as half/travel or full day.
</p>
<form action="/cgi-bin/perdiem.php" method="post">
<form action="/cgi-bin/perdiem.php" method="post" enctype="multipart/form-data" accept-charset="utf-8">
<!-- Define default settings and rates. Currently Germany -->
<input type="hidden" name="defaults" value="€/0.2/0.4/0.4" />
@@ -48,43 +48,33 @@
<div class="row form-group form-inline">
<label class="col-sm-3">Employee:</label>
<select class="form-control col-sm-9" name="who" size="1" required="required">
<option />
<option value="Alexander Sander|alex.sander">Alexander Sander</option>
<option value="Ana Galan|anaghz">Ana Galán</option>
<option value="Bonnie Mehring|bonnie">Bonnie Mehring</option>
<option value="Carmen Bianca Bakker|carmenbianca">Carmen Bianca Bakker</option>
<option value="Dario Presutti|dario">Dario Presutti</option>
<option value="Erik Albers|eal">Erik Albers</option>
<option value="Erika Pirić|epiric">Erika Pirić</option>
<option value="Florian Snow|floriansnow">Florian Snow</option>
<option value="Francesca Indorato|fi">Francesca Indorato</option>
<option value="Gabriel Ku Wei Bin|gabriel.ku">Gabriel Ku Wei Bin</option>
<option value="Henning Fehr|hf">Henning Fehr</option>
<option value="Johannes Näder|jn">Johannes Näder</option>
<option value="Linus Sehn|linus">Linus Sehn</option>
<option value="Lucas Lasota|lucas.lasota">Lucas Lasota</option>
<option value="Max Mehl|max.mehl">Max Mehl</option>
<option value="Matthias Kirschner|mk">Matthias Kirschner</option>
<option value="Reinhard Müller|reinhard">Reinhard Müller</option>
<option value="Tobias Diekershoff|tobiasd">Tobias Diekershoff</option>
</select>
</div>
<div class="row form-group">
<label class="col-sm-3">ER number for this trip:</label>
<div class="col-sm-4">
<input type="text" name="er" class="form-control" pattern="(^\?$|^er\.[\d]{4}-[\d]{2}-[\d]{2}\.[\d.-]+)" placeholder="er.2020-..." required="required" />
</div>
<div class="col-sm-5 small">
(Enter <strong>?</strong> if you do not have it)
<div class="col-sm-9">
<select class="form-control col-sm-9" name="who" size="1" required="required">
<option />
<module id="fsfe-employee-options" />
</select>
</div>
</div>
<div class="row form-group">
<label class="col-sm-3">Catchphrase of ER:</label>
<div class="col-sm-4">
<input type="text" name="catch" class="form-control" required="required" />
<label class="col-sm-3">Activity:</label>
<div class="col-sm-9">
<select class="form-control col-sm-9" name="activity" id="activity" size="1" required="required">
<option />
<module id="fsfe-activities-options" />
</select>
</div>
</div>
<div class="row form-group">
<label class="col-sm-3" label-for="description">Description (optional):</label>
<div class="col-sm-9">
<input type="text" id="description" name="description" class="form-control" />
</div>
<div id="description-help" class="col-sm-offset-3 col-sm-9">
Leave blank for activities with only one trip (e.g. FOSDEM, SFSCON).
For activities involving more than one trip (e.g. multiple meetings),
please describe the trip in detail.
</div>
</div>
fsfe.org/internal/rc.en.xhtml
+41 -45
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<html>
<version>1</version>
<version>2</version>
<head>
<title>Reimbursement Claim / Credit Card statement</title>
@@ -22,32 +22,14 @@
selecting the correct type (Reimbursement Claim or Credit Card).
</p>
<form action="/cgi-bin/reimbursement.php" method="post" enctype="multipart/form-data">
<form id="rcform" action="/cgi-bin/reimbursement.php" method="post" enctype="multipart/form-data" accept-charset="utf-8">
<h2>1. Set general options</h2>
<div class="form-group form-inline">
<label class="col-sm-3">Employee:</label>
<select class="form-control col-sm-9" name="who" size="1" required="required">
<option />
<option value="Alexander Sander|alex.sander">Alexander Sander</option>
<option value="Ana Galan|anaghz">Ana Galán</option>
<option value="Bonnie Mehring|bonnie">Bonnie Mehring</option>
<option value="Carmen Bianca Bakker|carmenbianca">Carmen Bianca Bakker</option>
<option value="Dario Presutti|dario">Dario Presutti</option>
<option value="Erik Albers|eal">Erik Albers</option>
<option value="Erika Pirić|epiric">Erika Pirić</option>
<option value="Florian Snow|floriansnow">Florian Snow</option>
<option value="Francesca Indorato|fi">Francesca Indorato</option>
<option value="Gabriel Ku Wei Bin|gabriel.ku">Gabriel Ku Wei Bin</option>
<option value="Heiki Lõhmus|repentinus">Heiki Lõhmus</option>
<option value="Henning Fehr|hf">Henning Fehr</option>
<option value="Johannes Näder|jn">Johannes Näder</option>
<option value="Linus Sehn|linus">Linus Sehn</option>
<option value="Lucas Lasota|lucas.lasota">Lucas Lasota</option>
<option value="Max Mehl|max.mehl">Max Mehl</option>
<option value="Matthias Kirschner|mk">Matthias Kirschner</option>
<option value="Reinhard Müller|reinhard">Reinhard Müller</option>
<option value="Tobias Diekershoff|tobiasd">Tobias Diekershoff</option>
<module id="fsfe-employee-options" />
</select>
</div>
@@ -75,10 +57,9 @@
<option value="12">December</option>
</select>
<select class="form-control" name="rc_year">
<option value="2022">2022</option>
<option value="2023">2023</option>
<option value="2024" selected="selected">2024</option>
<option value="2025">2025</option>
<option value="2024">2024</option>
<option value="2025" selected="selected">2025</option>
</select>
</label>
</div>
@@ -88,19 +69,26 @@
<div class="radio form-inline col-sm-offset-3 col-sm-9">
<label>
<input type="radio" name="type" value="cc" required="required" />
Credit Card for quarter
Credit Card for month
<select class="form-control" name="cc_month">
<option />
<option value="Q1">Q1</option>
<option value="Q2">Q2</option>
<option value="Q3">Q3</option>
<option value="Q4">Q4</option>
<option value="01">January</option>
<option value="02">February</option>
<option value="03">March</option>
<option value="04">April</option>
<option value="05">May</option>
<option value="06">June</option>
<option value="07">July</option>
<option value="08">August</option>
<option value="09">September</option>
<option value="10">October</option>
<option value="11">November</option>
<option value="12">December</option>
</select>
<select class="form-control" name="cc_year">
<option value="2022">2022</option>
<option value="2023">2023</option>
<option value="2024" selected="selected">2024</option>
<option value="2025">2025</option>
<option value="2024">2024</option>
<option value="2025" selected="selected">2025</option>
</select>
</label>
</div>
@@ -113,8 +101,8 @@
<th>Date</th>
<th>Amount</th>
<th>Recipient</th>
<th>ER number</th>
<th>Catchphrase</th>
<th>Activity</th>
<th>Category</th>
<th>Description</th>
<th>Receipt Scan</th>
<th>Rows</th>
@@ -124,9 +112,9 @@
<td>"Belegdatum" for credit card statements</td>
<td>In EUR. Format: 123,00</td>
<td></td>
<td>Valid ER number</td>
<td>Catch phrase for the ER</td>
<td>What specifically was paid for. <strong>-</strong> if equal to catchphrase</td>
<td>What activity was this part of</td>
<td>What category is the expense</td>
<td>What specifically was paid for.</td>
<td>Upload receipt as PDF, max. 2MB each</td>
<td>Add a new row, or delete one</td>
</tr>
@@ -135,8 +123,8 @@
<td>Example 1: 16.04.2021</td>
<td>12,34</td>
<td>Berlin Bus Company</td>
<td>er.2021-04-16.123.4567</td>
<td>Cool Conference</td>
<td>Select the activity</td>
<td>Select fitting category or "other"</td>
<td>Bus ticket from Berlin to New York</td>
<td>e.g. busticket.pdf</td>
<td></td>
@@ -146,8 +134,8 @@
<td>Example 2: 17.04.2021</td>
<td>67,89</td>
<td>ACME</td>
<td>er.2021-04-17.890.1234</td>
<td>New laptop for Jane Doe</td>
<td></td>
<td></td>
<td>USB adapter for external keyboard</td>
<td>e.g. acme-adapter.pdf</td>
<td></td>
@@ -157,9 +145,18 @@
<td><input type="date" name="entry[]" class="form-control" required="required" /></td>
<td><input type="text" name="amount[]" class="form-control" pattern="-?\d{0,5},\d{2}" placeholder="12,34" required="required" /></td>
<td><input type="text" name="recipient[]" class="form-control" required="required" /></td>
<td><input type="text" name="er[]" class="form-control" pattern="^er\.[\d]{4}-[\d]{2}-[\d]{2}\.[\d.-]+" placeholder="er.2020-..." required="required" /></td>
<td><input type="text" name="catch[]" class="form-control" required="required" /></td>
<td><input type="text" name="remarks[]" class="form-control" required="required" /></td>
<td><select class="form-control col-sm-3" name="activity" id="activity" size="1" required="required">
<module id="fsfe-activities-options" />
</select></td>
<td><select class="form-control col-sm-3" name="category" id="category" size="1">
<option value="????:Other / I don't know">Other / I don't know</option>
<option value="6815:Office material">Office material</option>
<option value="6710:Packaging material">Packaging material</option>
<option value="6800:Postage">Postage</option>
<option value="6660:Travel costs - hotel">Travel costs - hotel</option>
<option value="6663:Travel costs - transport">Travel costs - transport</option>
</select></td>
<td><input type="text" name="description[]" class="form-control" required="required" /></td>
<td><input type="file" name="receipt[]" class="form-control" required="required" /></td>
<td><input type="button" class="AddNewRow btn btn-primary" value="+ 1 row" /></td>
</tr>
@@ -199,5 +196,4 @@
</body>
</html>