Compare commits
	
		
			4 Commits
		
	
	
		
			c337d2200f
			...
			ac8cd6534a
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| ac8cd6534a | |||
| 51d8e953c0 | |||
| 2eec677f41 | |||
| f2eb14d3ef | 
@ -1,4 +1,4 @@
 | 
			
		||||
## Unreleased
 | 
			
		||||
## 1.0.2 / 2023-02-18 21:48+01:00
 | 
			
		||||
 | 
			
		||||
* Add support for device info (https://git.kucharczyk.xyz/lukas/timetracker/issues/49)
 | 
			
		||||
* Add support for purchase ownership information (https://git.kucharczyk.xyz/lukas/timetracker/issues/48)
 | 
			
		||||
 | 
			
		||||
@ -6,7 +6,7 @@ RUN npm install && \
 | 
			
		||||
 | 
			
		||||
FROM python:3.10.9-slim-bullseye
 | 
			
		||||
 | 
			
		||||
ENV VERSION_NUMBER 1.0.0
 | 
			
		||||
ENV VERSION_NUMBER 1.0.2
 | 
			
		||||
ENV PROD 1
 | 
			
		||||
ENV PYTHONUNBUFFERED=1
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -21,7 +21,7 @@
 | 
			
		||||
            {% if purchase %}<a class="dark:text-white hover:underline block" href="{% url 'list_sessions_by_edition' purchase.edition.id %}">See all platforms</a>{% endif %}
 | 
			
		||||
            {% endif %}
 | 
			
		||||
            {% if dataset.count >= 1 %}
 | 
			
		||||
            <a href="{% url 'start_session' last.purchase.id %}">
 | 
			
		||||
            <a href="{% url 'start_session' last.id %}">
 | 
			
		||||
                <button type="button" title="Track last tracked" class="mt-10 py-1 px-2 bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg ">
 | 
			
		||||
                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="self-center w-6 h-6 inline">
 | 
			
		||||
                        <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" />
 | 
			
		||||
 | 
			
		||||
@ -19,7 +19,7 @@ urlpatterns = [
 | 
			
		||||
        name="update_session",
 | 
			
		||||
    ),
 | 
			
		||||
    path(
 | 
			
		||||
        "start-session/<int:purchase_id>",
 | 
			
		||||
        "start-session/<int:last_session_id>",
 | 
			
		||||
        views.start_session,
 | 
			
		||||
        name="start_session",
 | 
			
		||||
    ),
 | 
			
		||||
@ -30,8 +30,10 @@ urlpatterns = [
 | 
			
		||||
    ),
 | 
			
		||||
    path("add-purchase/", views.add_purchase, name="add_purchase"),
 | 
			
		||||
    path("add-edition/", views.add_edition, name="add_edition"),
 | 
			
		||||
    path("edit-edition/<int:edition_id>", views.edit_edition, name="edit_edition"),
 | 
			
		||||
    path("add-device/", views.add_device, name="add_device"),
 | 
			
		||||
    path("edit-session/<int:session_id>", views.edit_session, name="edit_session"),
 | 
			
		||||
    path("edit-purchase/<int:purchase_id>", views.edit_purchase, name="edit_purchase"),
 | 
			
		||||
    path("list-sessions/", views.list_sessions, name="list_sessions"),
 | 
			
		||||
    path(
 | 
			
		||||
        "list-sessions/by-purchase/<int:purchase_id>",
 | 
			
		||||
 | 
			
		||||
@ -67,8 +67,39 @@ def edit_session(request, session_id=None):
 | 
			
		||||
    return render(request, "add.html", context)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def start_session(request, purchase_id=None):
 | 
			
		||||
    session = SessionForm({"purchase": purchase_id, "timestamp_start": now_with_tz()})
 | 
			
		||||
def edit_purchase(request, purchase_id=None):
 | 
			
		||||
    context = {}
 | 
			
		||||
    purchase = Purchase.objects.get(id=purchase_id)
 | 
			
		||||
    form = PurchaseForm(request.POST or None, instance=purchase)
 | 
			
		||||
    if form.is_valid():
 | 
			
		||||
        form.save()
 | 
			
		||||
        return redirect("list_sessions")
 | 
			
		||||
    context["title"] = "Edit Purchase"
 | 
			
		||||
    context["form"] = form
 | 
			
		||||
    return render(request, "add.html", context)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def edit_edition(request, edition_id=None):
 | 
			
		||||
    context = {}
 | 
			
		||||
    edition = Edition.objects.get(id=edition_id)
 | 
			
		||||
    form = EditionForm(request.POST or None, instance=edition)
 | 
			
		||||
    if form.is_valid():
 | 
			
		||||
        form.save()
 | 
			
		||||
        return redirect("list_sessions")
 | 
			
		||||
    context["title"] = "Edit Edition"
 | 
			
		||||
    context["form"] = form
 | 
			
		||||
    return render(request, "add.html", context)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def start_session(request, last_session_id: int):
 | 
			
		||||
    last_session = Session.objects.get(id=last_session_id)
 | 
			
		||||
    session = SessionForm(
 | 
			
		||||
        {
 | 
			
		||||
            "purchase": last_session.purchase.id,
 | 
			
		||||
            "timestamp_start": now_with_tz(),
 | 
			
		||||
            "device": last_session.device,
 | 
			
		||||
        }
 | 
			
		||||
    )
 | 
			
		||||
    session.save()
 | 
			
		||||
    return redirect("list_sessions")
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,6 +1,6 @@
 | 
			
		||||
[tool.poetry]
 | 
			
		||||
name = "timetracker"
 | 
			
		||||
version = "1.0.1"
 | 
			
		||||
version = "1.0.2"
 | 
			
		||||
description = "A simple time tracker."
 | 
			
		||||
authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
 | 
			
		||||
license = "GPL"
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user