Compare commits

...

2 Commits

Author SHA1 Message Date
e0a6b0a34c Affichage en colonne 2022-09-24 12:20:44 +02:00
efc0fe0f75 Chgt theme par defaut, chgt emoji 2022-09-24 11:37:24 +02:00
7 changed files with 35 additions and 7 deletions

View File

@ -3,7 +3,7 @@
from flask import Flask, render_template, Markup, request, redirect, url_for, make_response from flask import Flask, render_template, Markup, request, redirect, url_for, make_response
from classes import task from classes import task
from datetime import datetime, timedelta from datetime import datetime, timedelta
from funcs import dumptasks, gettasks, cattasks, deltask, findtask, addtask, mktaskdir, exporttasks, getthemes, switchstatus, todotasks, donetasks from funcs import *
from random import choice from random import choice
#!---------- sq_todo.py ---------- #!---------- sq_todo.py ----------
@ -150,4 +150,5 @@ def edit():
if __name__ == '__main__': if __name__ == '__main__':
convertemoji()
app.run(host="0.0.0.0") app.run(host="0.0.0.0")

View File

@ -21,7 +21,7 @@ class task:
if done: if done:
self.donemark = "" self.donemark = ""
else: else:
self.donemark = "😓" self.donemark = "⚠️"
def rendertime(self, pretimestamp: int): def rendertime(self, pretimestamp: int):
""" """
@ -41,6 +41,7 @@ class task:
rendered = f""" rendered = f"""
<hr> <hr>
<div class="taskcontainer">
<div class="tasktitle">{self.donemark} {Markup.escape(self.title)}</div> <div class="tasktitle">{self.donemark} {Markup.escape(self.title)}</div>
<form action="." method="GET" name="{self.createtime}"> <form action="." method="GET" name="{self.createtime}">
<button type="submit" name="toswitch" value="{self.createtime}" class "taskbutton">Done/Todo</button>|<button type="submit" name="delete" value="{self.createtime}" class="taskbutton" onclick="return confirm('Really ?')">Delete</button>|<button type="submit" name="edit" value="{self.createtime}" class="taskbutton">Edit</button> <button type="submit" name="toswitch" value="{self.createtime}" class "taskbutton">Done/Todo</button>|<button type="submit" name="delete" value="{self.createtime}" class="taskbutton" onclick="return confirm('Really ?')">Delete</button>|<button type="submit" name="edit" value="{self.createtime}" class="taskbutton">Edit</button>
@ -49,6 +50,7 @@ class task:
<div class="tasktime">Created : {self.rendertime(self.createtime)} <div class="tasktime">Created : {self.rendertime(self.createtime)}
<br>Modified : {self.rendertime(self.modtime)}</div><br> <br>Modified : {self.rendertime(self.modtime)}</div><br>
<div class="tasktext">{markdown.markdown(self.text, extensions=['fenced_code', 'codehilite', 'nl2br', 'smarty'])}</div><br> <div class="tasktext">{markdown.markdown(self.text, extensions=['fenced_code', 'codehilite', 'nl2br', 'smarty'])}</div><br>
</div>
""" """
return Markup(rendered) return Markup(rendered)

View File

@ -122,7 +122,7 @@ def switchstatus(task):
rightnow = int(time.time()) rightnow = int(time.time())
if task.donemark == "": if task.donemark == "":
task.donemark = "😓" task.donemark = "⚠️"
else: else:
task.donemark = "" task.donemark = ""
@ -137,7 +137,7 @@ def todotasks(tasklist):
buffer = [] buffer = []
finalstr = "" finalstr = ""
for task in tasklist: for task in tasklist:
if task.donemark == "😓": if task.donemark == "⚠️":
buffer.append(task) buffer.append(task)
tasks = sorted(buffer, key=lambda task: task.priority, reverse=True) tasks = sorted(buffer, key=lambda task: task.priority, reverse=True)
@ -162,6 +162,13 @@ def donetasks(tasklist):
return finalstr return finalstr
def convertemoji():
tasks = gettasks()
for task in tasks:
if task.donemark not in ["⚠️", ""]:
task.donemark = "⚠️"
dumptasks(tasks)

View File

@ -73,6 +73,19 @@ a {
font-size: 1em; font-size: 1em;
} }
.globalcontainer {
text-align: left;
margin: auto;
padding: 10px;
width: 900px;
}
.taskcontainer {
border: 3px dotted;
margin: 20px;
padding: 10px;
}
.topbar { .topbar {
background-color: #eee8d5; background-color: #eee8d5;
border: none; border: none;
@ -292,3 +305,4 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
.codehilite .vm { color: #268bd2 } /* Name.Variable.Magic */ .codehilite .vm { color: #268bd2 } /* Name.Variable.Magic */
.codehilite .il { color: #2aa198 } /* Literal.Number.Integer.Long */ .codehilite .il { color: #2aa198 } /* Literal.Number.Integer.Long */

View File

@ -17,7 +17,7 @@
<input type="hidden" name="tasknumber" value="{{ tasknumber }}" /> <input type="hidden" name="tasknumber" value="{{ tasknumber }}" />
<label for"donemark">Status: </label> <label for"donemark">Status: </label>
<select name="donemark" id="donemark" class="donemarkselect"> <select name="donemark" id="donemark" class="donemarkselect">
<option value="😓" {{ todoselected }}>😓</option> <option value="⚠️" {{ todoselected }}>⚠️</option>
<option value="✅" {{ doneselected }}></option> <option value="✅" {{ doneselected }}></option>
</select> </select>
<button type="submit" name="submit">OK</button> <button type="submit" name="submit">OK</button>

View File

@ -23,11 +23,15 @@
<hr> <hr>
<h2 class="separator">Todo</h2> <h2 class="separator">Todo</h2>
<hr> <hr>
{{ ntodo }} <div class="globalcontainer">
{{ ntodo }}
</div>
<hr> <hr>
<h2 class="separator">Done</h2> <h2 class="separator">Done</h2>
<hr> <hr>
{{ ndone }} <div class="globalcontainer">
{{ ndone }}
</div>
</body> </body>
<footer> <footer>