Renamed "TODO" to "MAIN" for compatibility

This commit is contained in:
2021-07-04 22:47:41 +02:00
parent a6a9b0fbd6
commit d02808926c
11 changed files with 45 additions and 30 deletions
+31 -16
View File
@@ -254,8 +254,14 @@ else if (!empty($_POST["action"]))
{ {
$action = $_POST["action"]; $action = $_POST["action"];
$modified = false; $modified = false;
if ($action === "add") if ($action === "add" || $action == "edit")
{ {
if (!empty($_POST["todo_item_id"]))
{
$id_to_edit = $_POST["todo_item_id"];
}
if (!empty($_POST["todo_title"])) if (!empty($_POST["todo_title"]))
{ {
$title = $_POST["todo_title"]; $title = $_POST["todo_title"];
@@ -285,7 +291,7 @@ else if (!empty($_POST["action"]))
$model["list"] = array(); $model["list"] = array();
} }
$model["list"][] = array( $new_item = array(
"title" => $title, "title" => $title,
"description" => $description, "description" => $description,
"deadline" => $deadline, "deadline" => $deadline,
@@ -294,6 +300,15 @@ else if (!empty($_POST["action"]))
"modified" => $now, "modified" => $now,
); );
if (!empty($id_to_edit) && !empty($model["list"][$id_to_edit]))
{
$model["list"][$id_to_edit] = $new_item;
}
else
{
$model["list"][] = $new_item;
}
$modified = true; $modified = true;
} }
} }
@@ -369,7 +384,7 @@ function todo_list(array $model = []) : string
$te = new template_engine(); $te = new template_engine();
$te->set_block("TITLE", $model["username"] . "'s to-do List"); $te->set_block("TITLE", $model["username"] . "'s to-do List");
$te->append_block_template("CONTENT", "TODO_LIST"); $te->append_block_template("CONTENT", "MAIN_LIST");
$te->append_block_template("CONTENT", "ADD_FORM"); $te->append_block_template("CONTENT", "ADD_FORM");
$te->append_block_template("CONTENT", "NAVBAR"); $te->append_block_template("CONTENT", "NAVBAR");
@@ -455,7 +470,7 @@ function todo_list(array $model = []) : string
if (!empty($categories)) if (!empty($categories))
{ {
$te->set_block("TODO_ITEMS", ""); $te->set_block("MAIN_ITEMS", "");
} }
$te->set_block("DATALIST_AUTOFILLS", ""); $te->set_block("DATALIST_AUTOFILLS", "");
@@ -466,7 +481,7 @@ function todo_list(array $model = []) : string
{ {
$category_name = $category["title"]; $category_name = $category["title"];
$category_basis = $category["basis"]; $category_basis = $category["basis"];
$te->set_block("TODO_CATEGORY_ITEMS", ""); $te->set_block("MAIN_CATEGORY_ITEMS", "");
if ($category_basis == "custom") if ($category_basis == "custom")
{ {
@@ -481,23 +496,23 @@ function todo_list(array $model = []) : string
if (empty($item["description"])) if (empty($item["description"]))
{ {
$te->set_block_template("TODO_ITEM_SUMMARY", "TODO_ITEM_SUMMARY_NODESC"); $te->set_block_template("MAIN_ITEM_SUMMARY", "MAIN_ITEM_SUMMARY_NODESC");
} }
else else
{ {
$te->set_block_template("TODO_ITEM_SUMMARY", "TODO_ITEM_SUMMARY_DESC"); $te->set_block_template("MAIN_ITEM_SUMMARY", "MAIN_ITEM_SUMMARY_DESC");
} }
$te->append_argumented_block("TODO_CATEGORY_ITEMS", "TODO_ITEM", [ $te->append_argumented_block("MAIN_CATEGORY_ITEMS", "MAIN_ITEM", [
"TODO_ITEM_ID" => $key, "MAIN_ITEM_ID" => $key,
"TODO_ITEM_TITLE" => $item["title"], "MAIN_ITEM_TITLE" => $item["title"],
"TODO_ITEM_DESCRIPTION" => $item["description"], "MAIN_ITEM_DESCRIPTION" => $item["description"],
]); ]);
} }
$te->append_argumented_block("TODO_ITEMS", "TODO_CATEGORY", [ $te->append_argumented_block("MAIN_ITEMS", "MAIN_CATEGORY", [
"TODO_CATEGORY_ID" => $category_key, "MAIN_CATEGORY_ID" => $category_key,
"TODO_CATEGORY_TITLE" => $category_name, "MAIN_CATEGORY_TITLE" => $category_name,
]); ]);
} }
$te->append_argumented_block("DATALISTS", "DATALIST", [ $te->append_argumented_block("DATALISTS", "DATALIST", [
@@ -515,8 +530,8 @@ function todo_list(array $model = []) : string
"DATALIST_ID" => "todo_titles", "DATALIST_ID" => "todo_titles",
]); ]);
// $te->append_block("TODO_ITEMS", "<pre><details open><summary>dump</summary>".print_r($model, true)."</details></pre>"); // $te->append_block("MAIN_ITEMS", "<pre><details open><summary>dump</summary>".print_r($model, true)."</details></pre>");
// $te->append_block("TODO_ITEMS", "<pre><details open><summary>dump</summary>".print_r($categories, true)."</details></pre>"); // $te->append_block("MAIN_ITEMS", "<pre><details open><summary>dump</summary>".print_r($categories, true)."</details></pre>");
return $te->get_html(); return $te->get_html();
exit(0); exit(0);
} }
+4
View File
@@ -0,0 +1,4 @@
<div class="todo-category" id="todo-category-{{ MAIN_CATEGORY_ID }}">
<h3>{{ MAIN_CATEGORY_TITLE }}</h3>
{{ MAIN_CATEGORY_ITEMS }}
</div>
+1
View File
@@ -0,0 +1 @@
<b>{{ MAIN_ITEM_TITLE }}:</b> {{ MAIN_ITEM_DESCRIPTION }}
+1
View File
@@ -0,0 +1 @@
<b>{{ MAIN_ITEM_TITLE }}</b>
@@ -1,18 +1,18 @@
<div class="todo-item" id="todo-item-{{ TODO_ITEM_ID }}"> <div class="todo-item" id="todo-item-{{ MAIN_ITEM_ID }}">
<details> <details>
<summary>{{ TODO_ITEM_SUMMARY }}</summary> <summary>{{ MAIN_ITEM_SUMMARY }}</summary>
<form action="./" method="POST"> <form action="./" method="POST">
<input type="hidden" name="action" value="delay" /> <input type="hidden" name="action" value="delay" />
<input type="hidden" name="delay_by" value="-1 week" /> <input type="hidden" name="delay_by" value="-1 week" />
<input type="hidden" name="todo_item_id" value="{{ TODO_ITEM_ID }}" /> <input type="hidden" name="todo_item_id" value="{{ MAIN_ITEM_ID }}" />
<input type="submit" value="-1 week" /> <input type="submit" value="-1 week" />
</form> </form>
<form action="./" method="POST"> <form action="./" method="POST">
<input type="hidden" name="action" value="delay" /> <input type="hidden" name="action" value="delay" />
<input type="hidden" name="delay_by" value="-1 day" /> <input type="hidden" name="delay_by" value="-1 day" />
<input type="hidden" name="todo_item_id" value="{{ TODO_ITEM_ID }}" /> <input type="hidden" name="todo_item_id" value="{{ MAIN_ITEM_ID }}" />
<input type="submit" value="-1 day" /> <input type="submit" value="-1 day" />
</form> </form>
@@ -21,14 +21,14 @@
<form action="./" method="POST"> <form action="./" method="POST">
<input type="hidden" name="action" value="delay" /> <input type="hidden" name="action" value="delay" />
<input type="hidden" name="delay_by" value="+1 day" /> <input type="hidden" name="delay_by" value="+1 day" />
<input type="hidden" name="todo_item_id" value="{{ TODO_ITEM_ID }}" /> <input type="hidden" name="todo_item_id" value="{{ MAIN_ITEM_ID }}" />
<input type="submit" value="+1 day" /> <input type="submit" value="+1 day" />
</form> </form>
<form action="./" method="POST"> <form action="./" method="POST">
<input type="hidden" name="action" value="delay" /> <input type="hidden" name="action" value="delay" />
<input type="hidden" name="delay_by" value="+1 week" /> <input type="hidden" name="delay_by" value="+1 week" />
<input type="hidden" name="todo_item_id" value="{{ TODO_ITEM_ID }}" /> <input type="hidden" name="todo_item_id" value="{{ MAIN_ITEM_ID }}" />
<input type="submit" value="+1 week" /> <input type="submit" value="+1 week" />
</form> </form>
@@ -37,7 +37,7 @@
<form action="./" method="POST"> <form action="./" method="POST">
<input type="hidden" name="action" value="remove" /> <input type="hidden" name="action" value="remove" />
<input type="hidden" name="todo_item_id" value="{{ TODO_ITEM_ID }}" /> <input type="hidden" name="todo_item_id" value="{{ MAIN_ITEM_ID }}" />
<input type="submit" value="Remove" /> <input type="submit" value="Remove" />
</form> </form>
+1
View File
@@ -0,0 +1 @@
<div class="todo-list">{{ MAIN_ITEMS }}</div>
-4
View File
@@ -1,4 +0,0 @@
<div class="todo-category" id="todo-category-{{ TODO_CATEGORY_ID }}">
<h3>{{ TODO_CATEGORY_TITLE }}</h3>
{{ TODO_CATEGORY_ITEMS }}
</div>
-1
View File
@@ -1 +0,0 @@
<b>{{ TODO_ITEM_TITLE }}:</b> {{ TODO_ITEM_DESCRIPTION }}
-1
View File
@@ -1 +0,0 @@
<b>{{ TODO_ITEM_TITLE }}</b>
-1
View File
@@ -1 +0,0 @@
<div class="todo-list">{{ TODO_ITEMS }}</div>