FSFE/fsfe-website
27
32
Fork 93
Code Issues 63 Pull Requests 18 Wiki Activity

update emp list
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
tobiasd
2025-03-18 11:32:54 +01:00
parent a6c8f88937
commit 104fe6229a
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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 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", "Description", "Receipt number", "Remarks")); // create array for CSV
$csvfile = tmpfile();
$csvfile_path = stream_get_meta_data($csvfile)['uri'];
$reimb_total = 0; // total reimbursement for early calculation
@@ -47,6 +47,7 @@ $dinner = isset($_POST["dinner"]) ? $_POST["dinner"] : false;
// Separate employee name parameters
$who_verbose = explode('|', $who)[0];
$who_empnumber = explode('|', $who)[2];
$who = explode('|', $who)[1];
// FUNCTIONS
@@ -259,7 +260,7 @@ foreach ($use as $d => $day) { // calculate for each day
</tr>";
// CSV for this receipt
$csv[$key] = array($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, $description, "", $remarks[$d]);
} // if day is used
} // foreach

5
fsfe.org/cgi-bin/reimbursement.php
View File

@@ -9,7 +9,7 @@ require 'PHPMailer/PHPMailer.php';
require 'PHPMailer/SMTP.php';
$html = ''; // create empty variable
$csv = array(array("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", "Description", "Receipt number", "Remarks")); // create array for CSV
$csvfile = tmpfile();
$csvfile_path = stream_get_meta_data($csvfile)['uri'];
@@ -34,6 +34,7 @@ $receipt_dest = [];
// Separate employee name parameters
$who_verbose = explode('|', $who)[0];
$who_empnumber = explode('|', $who)[2];
$who = explode('|', $who)[1];
@@ -220,7 +221,7 @@ foreach ($entry as $key => $date) { // run over each row
</tr>";
// CSV for this receipt
$csv[$receipt_no] = array($who_verbose, $date, $amount[$key], $recipient[$key], $activity_tag[$key], $activity_text[$key], $category_id[$key], $category_text[$key], $description[$key], $receipt_no, "");
$csv[$receipt_no] = array($who_empnumber, $who_verbose, $date, $amount[$key], $recipient[$key], $activity_tag[$key], $activity_text[$key], $category_id[$key], $category_text[$key], $description[$key], $receipt_no, "");
// Add receipt as email attachment
$email->addAttachment($receipt_dest[$key], basename($receipt_dest[$key]));

33
global/data/modules/fsfe-employee-options.en.xml
View File

@@ -4,24 +4,19 @@
<version>1</version>
<module>
<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="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="Sofia Aritz Albors Escobes|sofiaritz">Sofia Aritz Albors Escobes</option>
<option value="Tobias Diekershoff|tobiasd">Tobias Diekershoff</option>
<option value="Alexander Sander|alex.sander|">Alexander Sander </option>
<option value="Ana Galan|anaghz|79">Ana Galan </option>
<option value="Bonnie Mehring|bonnie|85">Bonnie Mehring </option>
<option value="Carmen Bianca Bakker|carmenbianca|">Carmen Bianca Bakker </option>
<option value="Dario Presutti|dario|83">Dario Presutti </option>
<option value="Erika Piric|epiric|92">Erika Piric </option>
<option value="Florian Snow|floriansnow|76">Florian Snow </option>
<option value="Francesca Indorato|fi|60">Francesca Indorato </option>
<option value="Gabriel Ku Wei Bin|gabriel.ku|58">Gabriel Ku Wei Bin </option>
<option value="Henning Fehr|hf|87">Henning Fehr </option>
<option value="Johannes Näder|jn|81">Johannes Näder </option>
<option value="Lucas Lasota|lucas.lasota|61">Lucas Lasota </option>
<option value="Sofia Escobades|sofiaritz|93">Sofia Escobades </option>
<option value="Tobias Diekershoff|tobiasd|82">Tobias Diekershoff </option>
</module>
</data>