Budget summary per committee and budget line #206

Mr-salto · 2024-09-30T11:26:08Z

re implementation of summary of expenses per committee and budget line

RafDevX

Haven't actually reviewed it properly because I'm not on my computer; this is just the obvious what I noticed while scrolling through without reading

RafDevX · 2024-09-30T15:49:01Z

expenses/models.py

@@ -216,6 +216,7 @@ def save_user_profile(sender, instance, **kwargs):
    instance.profile.save()


+


Remove extra line

RafDevX · 2024-09-30T15:49:25Z

compose.yaml

@@ -48,3 +54,5 @@ services:
      # Melvin here since he's treasurer at the time of writing.
      KTH_ID: melvinj

+volumes:
+  postgres_data:


Files should end with a newline

RafDevX · 2024-09-30T15:49:44Z

stats/urls.py

+
+

Remove extra lines

RafDevX · 2024-09-30T15:50:05Z

stats/views.py

@@ -46,29 +46,51 @@ def index(request):
 def summary(request):
    if request.method == "POST":
        body_data = json.loads(request.body)
-        # we tried getting it to work with ids, but it didn't,
-        # so we're using names for now
+        print("body = " , body_data)


Remove debug print

RafDevX · 2024-09-30T15:50:32Z

stats/views.py

            ).all()
-
+        


Remove extra tab

RafDevX · 2024-09-30T15:51:40Z

stats/views.py

+def sec_cost_centres(request):
+    if request.method == "POST":
+        body_data = json.loads(request.body)
+        print("body = " , body_data)


Remove debug print

RafDevX · 2024-09-30T15:51:49Z

stats/views.py

+            sec_cost_centres.add(expense_part.secondary_cost_centre)
+            # Optionally add the expense part details to the response
+
+        print("sec cost centres = " ,sec_cost_centres)


Remove debug print

RafDevX · 2024-09-30T15:52:45Z

stats/views.py

+def budget_lines(request):
+    if request.method == "POST":
+        body_data = json.loads(request.body)
+        print("body = " , body_data)


Remove debug print

RafDevX · 2024-09-30T15:53:14Z

stats/views.py

+    expense_queryset = models.Expense.objects.all()
+    # expense_queryset is a list of expenses 
+
+    print(expense_queryset)


Remove debug print

RafDevX · 2024-09-30T15:53:59Z

templates/stats/index.html

+                style="width: 100%;" 
+                :disabled="expense_parts.length > 1"
+              >
+                <option value="">- Year -</option>


Suggested change

<option value="">- Year -</option>

<option value="">- Välj år -</option>

foodelevator · 2024-09-30T20:16:18Z

compose.yaml

@@ -17,6 +17,7 @@ services:
      - 8000:8000
    volumes:
      - ./media:/app/media
+      - ./templates:/app/templates


Suggested change

- ./templates:/app/templates

I guess it should be written in the readme, but this is already handled if you start it with docker compose up --watch

foodelevator · 2024-09-30T20:27:37Z

compose.yaml

+    ports:
+      - 5432:5432
+


Suggested change

ports:

- 5432:5432

foodelevator · 2024-10-02T20:00:50Z

stats/views.py

@@ -80,6 +101,94 @@ def summary(request):
    return Response(status=status.HTTP_404_NOT_FOUND)


+@csrf_exempt
+def sec_cost_centres(request):
+    if request.method == "POST":


This should be a GET request

I need to make a POST as every secondary cost center is dependent on the primary cost center. Maybe there is an easier way to do it with a GET.

You can for instance use query parameters to send along data, if that's what you mean

foodelevator · 2024-10-02T20:00:57Z

stats/views.py

+
+@csrf_exempt
+def budget_lines(request):
+    if request.method == "POST":


Same reason

foodelevator · 2024-10-02T20:01:37Z

templates/stats/index.html

          <th>År</th>
+          <th> Nämnder </th>


Suggested change

<th> Nämnder </th>

<th>Resultatställe</th>

foodelevator · 2024-10-02T20:03:22Z

templates/stats/index.html

+                  :key="index"
+                  :value="costCentre"
+                >
+                {% verbatim %}


This works, but there is also the v-text property

Didn't know, thank you !

foodelevator · 2024-10-04T09:47:27Z

compose.yaml

+    volumes:
+      - postgres_data:/var/lib/postgresql/data


I don't see a reason to add this as data is persisted as long as you don't run docker compose down and it hides the data for those who already have something in their local databases

I didn't know and wanted to be sure that the fake data I inserted for tests purposes would be persistent.

RafDevX · 2024-10-28T14:39:48Z

compose.yaml

@@ -47,4 +50,4 @@ services:
      # Since we're using the real pls, it's nice to use some user with a lot of privileges. Putting
      # Melvin here since he's treasurer at the time of writing.
      KTH_ID: melvinj
-
+  


Suggested change

RafDevX · 2024-10-28T14:40:26Z

stats/views.py

+@require_GET
 def summary(request):
-    if request.method == "POST":
-        body_data = json.loads(request.body)
-        # we tried getting it to work with ids, but it didn't,
-        # so we're using names for now
+    if request.method == "GET":


Aren't these two lines synonymous?

RafDevX · 2024-10-28T14:45:24Z

templates/stats/index.html

-         activeCommittees: function() {
-             return this.committees.filter(c => !c.inactive);
-         },
+      el: '#content',


(can't believe I'm saying this) go back to 5 space indentation; easier for diff

RafDevX · 2024-11-07T16:35:34Z

templates/stats/index.html

+                 budgetLine: '',
+                 amount: 0,
+             }],
+             totalSum: null, 


Confirm whether this is still needed

RafDevX · 2024-11-07T16:36:38Z

stats/views.py

-        body_data = json.loads(request.body)
-        # we tried getting it to work with ids, but it didn't,
-        # so we're using names for now
-
        expense_parts = None


Fix indentation in all of these

Mr-salto requested a review from RafDevX September 30, 2024 11:27

RafDevX requested changes Sep 30, 2024

View reviewed changes

foodelevator reviewed Oct 2, 2024

View reviewed changes

foodelevator reviewed Oct 4, 2024

View reviewed changes

RafDevX requested changes Oct 28, 2024

View reviewed changes

RafDevX requested changes Nov 7, 2024

View reviewed changes

RafDevX approved these changes Nov 7, 2024

View reviewed changes

gabi added 6 commits November 7, 2024 16:51

Budget summary per committee and budget line

06f355e

Changes after review

ee15ec9

Changes after review 2

d09d217

Changing POSTs to GETs

1a45413

back to 5 spaces indentation

bedd4f4

indentation change

c06edf8

Mr-salto force-pushed the budgetline branch from 54f8e92 to c06edf8 Compare November 7, 2024 16:52

Mr-salto merged commit e1883ba into master Nov 7, 2024

foodelevator deleted the budgetline branch November 7, 2024 18:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Budget summary per committee and budget line #206

Budget summary per committee and budget line #206

Mr-salto commented Sep 30, 2024

RafDevX left a comment

RafDevX Sep 30, 2024

RafDevX Sep 30, 2024

RafDevX Sep 30, 2024

RafDevX Sep 30, 2024

RafDevX Sep 30, 2024

RafDevX Sep 30, 2024

RafDevX Sep 30, 2024

RafDevX Sep 30, 2024

RafDevX Sep 30, 2024

RafDevX Sep 30, 2024

foodelevator Sep 30, 2024

foodelevator Sep 30, 2024

foodelevator Oct 2, 2024

Mr-salto Oct 5, 2024

foodelevator Oct 6, 2024

foodelevator Oct 2, 2024

Mr-salto Oct 5, 2024

foodelevator Oct 2, 2024

foodelevator Oct 2, 2024

Mr-salto Oct 5, 2024

foodelevator Oct 4, 2024

Mr-salto Oct 5, 2024

RafDevX Oct 28, 2024

RafDevX Oct 28, 2024

RafDevX Oct 28, 2024

RafDevX Nov 7, 2024

RafDevX Nov 7, 2024

		@@ -216,6 +216,7 @@ def save_user_profile(sender, instance, **kwargs):
		instance.profile.save()

	<option value="">- Year -</option>
	<option value="">- Välj år -</option>

Budget summary per committee and budget line #206

Budget summary per committee and budget line #206

Conversation

Mr-salto commented Sep 30, 2024

RafDevX left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment