FSFE/fsfe-website
28
32
Fork 93
Code Issues 64 Pull Requests 13 Wiki Activity

PD form (#5172)
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #5172
Co-authored-by: Tobias Diekershoff <tobiasd@fsfe.org>
Co-committed-by: Tobias Diekershoff <tobiasd@fsfe.org>
This commit was merged in pull request #5172.
This commit is contained in:
tobiasd
2025-07-24 11:50:20 +00:00
committed by tobiasd
parent a717358b60
commit 632348b9c8
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fsfe.org/cgi-bin/perdiem.php
View File

@@ -22,7 +22,7 @@ require 'PHPMailer/PHPMailer.php';
require 'PHPMailer/SMTP.php';
$html = ''; // create empty variable
$csv = array(array("Employee number", "Employee name", "Date", "Amount (EUR)", "Recipient name", "Activity Tag", "Activity Text", "Category ID", "Category Text", "Description", "Receipt number", "Remarks")); // create array for CSV
$csv = array(array("Employee number", "Employee name", "Date", "Amount (EUR)", "Recipient name", "Activity Tag", "Activity Text", "Category ID", "Category Text", "Event", "Description", "Receipt number")); // create array for CSV
$csvfile = tmpfile();
$csvfile_path = stream_get_meta_data($csvfile)['uri'];
$reimb_total = 0; // total reimbursement for early calculation
@@ -33,7 +33,7 @@ $activity_tag = explode("||", $activity)[0];
$activity_text = explode("||", $activity)[1];
$category_id = "66640";
$category_text = "Per diem";
$description = isset($_POST["description"]) ? $_POST["description"] : false;
$event = isset($_POST["event"]) ? $_POST["event"] : false;
$extra = isset($_POST["extra"]) ? $_POST["extra"] : false;
$mailopt = isset($_POST["mailopt"]) ? $_POST["mailopt"] : false;
$defaults = isset($_POST["defaults"]) ? $_POST["defaults"] : false;
@@ -144,9 +144,8 @@ $html .= "<p>This per diem statement is made by <strong>$who_verbose</strong>.</
<th>Activity Text</th>
<th>Category Id</th>
<th>Category Text</th>
<th>Event</th>
<th>Description</th>
<th>Receipt Name</th>
<th>Remarks</th>
</tr>";
// Prepare email
@@ -254,13 +253,12 @@ foreach ($use as $d => $day) { // calculate for each day
<td>$activity_text</td>
<td>$category_id</td>
<td>$category_text</td>
<td>$description</td>
<td></td>
<td>$event</td>
<td>$remarks[$d]</td>
</tr>";
// CSV for this receipt
$csv[$key] = array($who_empnumber, $who_verbose, $date[$d], $reimb_day[$d], $who_verbose, $activity_tag, $activity_text, $category_id, $category_text, $description, "", $remarks[$d]);
$csv[$key] = array($who_empnumber, $who_verbose, $date[$d], $reimb_day[$d], $who_verbose, $activity_tag, $activity_text, $category_id, $category_text, $event, $remarks[$d], "");
} // if day is used
} // foreach
@@ -269,7 +267,7 @@ foreach ($use as $d => $day) { // calculate for each day
foreach ($csv as $fields) {
fputcsv($csvfile, $fields, ';', '"', '"');
}
$email->addAttachment($csvfile_path, filter_filename($date[$d]."-"."pd" ."-". $who ."-". $activity_tag ."-". $description . ".csv"));
$email->addAttachment($csvfile_path, filter_filename($date[$d]."-"."pd" ."-". $who ."-". $activity_tag ."-". $event . ".csv"));
// Prepare email body
$email_body = "Hi,

9
fsfe.org/internal/pd.en.xhtml
View File

@@ -59,7 +59,7 @@
<div class="row form-group">
<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" onChange="the_event = document.getElementById('activity').options[ document.getElementById('activity').selectedIndex ].dataset.event; if (the_event) { document.getElementById('description').value = the_event; }">
<select class="form-control col-sm-9" name="activity" id="activity" size="1" required="required" onChange="the_event = document.getElementById('activity').options[ document.getElementById('activity').selectedIndex ].dataset.event; document.getElementById('event').value = the_event || '';">
<option />
<module id="fsfe-activities-options" />
</select>
@@ -67,12 +67,11 @@
</div>
<div class="row form-group">
<label class="col-sm-3" label-for="description">Description (optional):</label>
<label class="col-sm-3" label-for="event">Event:</label>
<div class="col-sm-9">
<input type="text" id="description" name="description" class="form-control" />
<input type="text" id="event" name="event" class="form-control" required="required" />
</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).
<div id="event-help" class="col-sm-offset-3 col-sm-9">
For activities involving more than one trip (e.g. multiple meetings),
please describe the trip in detail.
</div>