Skip to content

Commit

Permalink
get contract from Journal object, ref #188
Browse files Browse the repository at this point in the history
  • Loading branch information
@michielbdejong
michielbdejong committed Jun 25, 2023
1 parent 79229d4 commit 6720a9e
Show file tree
Hide file tree
Showing 2 changed files with 138 additions and 22 deletions.
108 changes: 87 additions & 21 deletions src/pj2-based/Journal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,29 @@ abstract class PrejournalEntry {
function __construct($obj) {
$this->fields = $obj;
}

abstract function toJournalEntries($contract);
function getField($name) {
if (isset($this->fields[$name])) {
return $this->fields[$name];
}
throw new Exception("Field '$name' not set! Have: " . var_export($this->fields, true));
}
abstract function toJournalEntries($journal);
}

class WorkedPrejournalEntry extends PrejournalEntry {
function toJournalEntries($contract) {
function toJournalEntries($journal) {
$contract = $journal->getContract([
"organization" => $this->getField("organization"),
"worker" => $this->getField("worker"),
"date" => $this->getField("date")
]);

// $milestone = $journal->getMilestone([
// "organization" => $this->getField("organization"),
// "projectr" => $this->getField("project"),
// "date" => $this->getField("date")
// ]);

$hoursPerWeek = $contract["hours"];
// echo "$hoursPerWeek hours per week\n";/
$salaryPerMonth = $contract["amount"];
Expand All @@ -69,27 +86,27 @@ function toJournalEntries($contract) {
}

class SalaryPrejournalEntry extends PrejournalEntry {
function toJournalEntries($contract) {
function toJournalEntries($journal) {
return [];
}
}
class ContractPrejournalEntry extends PrejournalEntry {
function toJournalEntries($contract) {
function toJournalEntries($journal) {
return [];
}
}
class ExpensePrejournalEntry extends PrejournalEntry {
function toJournalEntries($contract) {
function toJournalEntries($journal) {
return [];
}
}
class LoanPrejournalEntry extends PrejournalEntry {
function toJournalEntries($contract) {
function toJournalEntries($journal) {
return [];
}
}
class IncomePrejournalEntry extends PrejournalEntry {
function toJournalEntries($contract) {
function toJournalEntries($journal) {
return [];
}
}
Expand Down Expand Up @@ -127,12 +144,6 @@ function formatJournalEntry($entry) {
. " $entry->account2\n";
}

function entryToPta($entry, $contract) {
$JournalEntries = $entry->toJournalEntries($contract);
$arr = array_map("formatJournalEntry", $JournalEntries);
return implode("\n\n", $arr);
}

function entrySortCb($a, $b) {
// echo "comparing " . var_export($a, true) . " to " . var_export($b, true) . "\n";
$aDateStr = dateFromEntry($a);
Expand Down Expand Up @@ -165,18 +176,74 @@ class Journal {

private $entries = [];
private $knownContracts = [];
private $knownMilestones = [];

function __construct() {
$this->knownContracts = [
// FIXME: for now you'll have to hard-code contracts here
];
}

private function entryToPta($entry) {
$JournalEntries = $entry->toJournalEntries($this);
$arr = array_map("formatJournalEntry", $JournalEntries);
return implode("\n\n", $arr);
}


public function getContract($query) {
foreach($this->knownContracts as $worker => $contracts) {
if ($worker !== $query["worker"]) {
// echo "Contract worker " . $worker . " !== " . $query["worker"] . "\n";
continue;
}
foreach($this->knownContracts[$worker] as $contract) {
// echo "Checking query '" . var_export($query, true) . "' against contract '" . var_export($contract, true) . "'\n";
if ($contract["organization"] !== $query["organization"]) {
// echo "Contract organization " . $contract["organization"] . " !== " . $query["organization"] . "\n";
continue;
}
if (dateIsAfter($contract["from"], $query["date"])) {
// echo "Contract started at '" . $contract["from"] . "' which is after '" . $query["date"] . "'\n";
continue;
}
if (isset($contract["to"]) && dateIsBefore($contract["to"], $query["date"])) {
// echo "Contract ended at '" . $contract["to"] . "' which is before '" . $query["date"] . "'\n";
continue;
}
// echo "Contract found! " . var_export($contract) . "\n";
return $contract;
}
}
throw new Exception("Contract not found!");
}

public function getMilestone($query) {
foreach($this->knownMilestones as $milestone) {
if ($milestone["organization"] !== $query["organization"]) {
// echo "milestone organization " . $milestone["organization"] . " !== " . $query["organization"] . "\n";
continue;
}
if ($milestone["project"] !== $query["project"]) {
// echo "milestone project " . $milestone["project"] . " !== " . $query["project"] . "\n";
continue;
}
if (dateIsAfter($milestone["from"], $query["date"])) {
// echo "milestone started at " . $milestone["from"] . " which is after " . $query["date"] . "\n";
continue;
}
if (dateIsBefore($milestone["to"], $query["date"])) {
// echo "milestone ended at " . $milestone["to"] . " which is before " . $query["date"] . "\n";
continue;
}
echo "milestone found! " . var_export($milestone) . "\n";
return $milestone;
}
throw new Exception("Milestone not found!");
}

function addEntries($newEntries) {
for ($i = 0; $i < count($newEntries); $i++) {
$this->entries[] = $newEntries[$i];
if ($newEntries[$i]["type"] == "contract") {
echo "Got contract for " . $newEntries[$i]["worker"];
// echo "Got contract for " . $newEntries[$i]["worker"] . "\n";
if (!isset($this->knownContracts[$newEntries[$i]["worker"]])) {
$this->knownContracts[$newEntries[$i]["worker"]] = [];
}
Expand All @@ -188,10 +255,9 @@ function addEntries($newEntries) {
function toPta() {
usort($this->entries, 'entrySortCb');
$highestDateYet = 0;
// FIXME: $contract = $this->knownContracts["some-worker-name"][0];
for ($i = 0; $i < count($this->entries); $i++) {
$obj = makePrejournalEntry($this->entries[$i]);
echo entryToPta($obj, $contract);
$obj = makePrejournalEntry($this->entries[$i]);
echo $this->entryToPta($obj);
$thisDate = new DateTime(dateFromEntry($this->entries[$i]));
$thisStamp = $thisDate->getTimestamp();
if ($thisStamp < $highestDateYet) {
Expand Down
52 changes: 51 additions & 1 deletion src/utils.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,61 @@ function timestampToDateTime($timestamp)

function dateTimeToTimestamp($dateTime)
{
$ret = new DateTime($dateTime);
$parts = explode(' ', $dateTime);
if (count($parts) != 3) {
throw new Exception("Could not parse date '$dateTime'");
}
$day = $parts[0];
$month = [
"jan" => 1,
"feb" => 2,
"mar" => 3,
"apr" => 4,
"may" => 5,
"jun" => 6,
"jul" => 7,
"aug" => 8,
"sep" => 9,
"oct" => 10,
"nov" => 11,
"dec" => 12
][$parts[1]];
$year = $parts[2];
$ret = new DateTime("$year-$month-$day");
// echo "Interpreting '$dateTime' to '" . $ret->format('j M Y') . "' ('" . $ret->format('Y-m-d H:i:s') . "')\n";
return $ret->getTimestamp();
}

function dateIsAfter($a, $b) {
$dA = new DateTime($a);
$dB = new DateTime($b);
if ($dA < $dB) {
// echo "'$a' = " . $dA->format('Y-m-d') . " is before '$b' = " . $dA->format('Y-m-d') . "\n";
return false;
} else if ($dA == $dB) {
// echo "'$a' = " . $dA->format('Y-m-d') . " is equal to '$b' = " . $dA->format('Y-m-d') . "\n";
return false;
} else if ($dA == $dB) {
// echo "'$a' = " . $dA->format('Y-m-d') . " is after '$b' = " . $dA->format('Y-m-d') . "\n";
return true;
}
}

function dateIsBefore($a, $b) {
$dA = new DateTime($a);
$dB = new DateTime($b);
if ($dA < $dB) {
// echo "'$a' = " . $dA->format('Y-m-d') . " is before '$b' = " . $dA->format('Y-m-d') . "\n";
return true;
} else if ($dA == $dB) {
// echo "'$a' = " . $dA->format('Y-m-d') . " is equal to '$b' = " . $dA->format('Y-m-d') . "\n";
return false;
} else if ($dA == $dB) {
// echo "'$a' = " . $dA->format('Y-m-d') . " is after '$b' = " . $dA->format('Y-m-d') . "\n";
return false;
}
}

function dateTimeToPta($dateTime)
{
$obj = new DateTime($dateTime);
Expand Down

0 comments on commit 6720a9e

Please sign in to comment.