ereuse/devicehub-django
9
0
Fork 0
Code Issues 6 Pull requests 12 Packages Projects Releases Wiki Activity

WIP: Lot groups search/filtering and lot groups panel ui changes #61

Draft
rskthomas wants to merge 17 commits from rework/lots into main
pull from: rework/lots
merge into: ereuse:main
Conversation 1 Commits 17 Files changed 22 +539 -166
rskthomas commented 2025-02-27 11:35:10 +00:00
Owner
Copy link

This PR makes some changes on the lot groups views. mostly those of (ereuse/projectes#183).

  • Fix for incorrect collapse of left menu (ereuse/projectes#183)
    • This happened because the add path was the same for multiple routes
    • By changing the views/urls to the lot app and checking for the prefix this ambiguity doesnt happen anymore
  • Added a search and filter button (closed lots, open lots - default - , and both)
  • Setted a max char for left menu items, so overflow doesnt happen (ereuse/projectes#183)
  • Lot names cannot be the same for lots within the same lot group (model constraint- ereuse/projectes#142)
  • Changes to lot group creation edit and delete buttons and popups (ereuse/projectes#183)
  • Changes to url redirect after lot operations (ereuse/projectes#183)
  • Can be sorted by the different columns
  • Lot groups can now be reordered on the admin panel (ereuse/projectes#182)
  • Added timestamp for lots view (ereuse/projectes#185)

What this PR doesnt do:

  • Refactor of the whole project from lot-tag --> lot-group
    • I think this will touch quite some files and it would make this PR less amicable for review, so i'll do it later on a separate pr

image
image
image

This PR makes some changes on the lot groups views. mostly those of (ereuse/projectes#183). - Fix for incorrect collapse of left menu (ereuse/projectes#183) - - This happened because the add path was the same for multiple routes - - By changing the views/urls to the lot app and checking for the prefix this ambiguity doesnt happen anymore - Added a search and filter button (closed lots, open lots - default - , and both) - Setted a max char for left menu items, so overflow doesnt happen (ereuse/projectes#183) - Lot names cannot be the same for lots within the same lot group (model constraint- ereuse/projectes#142) - Changes to lot group creation edit and delete buttons and popups (ereuse/projectes#183) - Changes to url redirect after lot operations (ereuse/projectes#183) - Can be sorted by the different columns - Lot groups can now be reordered on the admin panel (ereuse/projectes#182) - Added timestamp for lots view (ereuse/projectes#185) What this PR doesnt do: - Refactor of the whole project from lot-tag --> lot-group - - I think this will touch quite some files and it would make this PR less amicable for review, so i'll do it later on a separate pr ![image](/attachments/333f60bb-185f-4006-8d31-ac9b2f88c704) ![image](https://farga.pangea.org/attachments/24a782df-d420-439c-8a91-5332abd55719) ![image](https://farga.pangea.org/attachments/a5327320-498e-4d8e-ae5b-9a7aef183a8f)
image.png
140 KiB
edit-lot-group-inbox.png
79 KiB
warning_lot_group_has_2_lots.png
80 KiB
rskthomas added 14 commits 2025-02-27 11:35:11 +00:00
rskthomas changed title from WIP: Lot groups and lot groups panel ui changes to WIP: Lot groups search/filtering and lot groups panel ui changes 2025-02-28 14:03:33 +00:00
rskthomas added 1 commit 2025-02-28 19:55:35 +00:00
rskthomas added 1 commit 2025-02-28 19:58:48 +00:00
rskthomas changed title from WIP: Lot groups search/filtering and lot groups panel ui changes to Lot groups search/filtering and lot groups panel ui changes 2025-02-28 20:32:18 +00:00
rskthomas requested review from cayop 2025-02-28 20:32:25 +00:00
rskthomas requested review from pedro 2025-02-28 20:32:25 +00:00
rskthomas commented 2025-03-03 12:08:33 +00:00
Author
Owner
Copy link

I could also (given ereuse/projectes#187) to rename 'closed' --> 'archived' on this PR

I could also (given ereuse/projectes#187) to rename 'closed' --> 'archived' on this PR
rskthomas added 1 commit 2025-03-03 16:39:58 +00:00
rskthomas changed title from Lot groups search/filtering and lot groups panel ui changes to WIP: Lot groups search/filtering and lot groups panel ui changes 2025-03-05 19:13:43 +00:00
This pull request has changes conflicting with the target branch.
  • lot/templates/lots.html
  • lot/views.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin rework/lots:rework/lots
git checkout rework/lots

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff rework/lots
git checkout main
git merge --ff-only rework/lots
git checkout rework/lots
git rebase main
git checkout main
git merge --no-ff rework/lots
git checkout main
git merge --squash rework/lots
git checkout main
git merge --ff-only rework/lots
git checkout main
git merge rework/lots
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
cayop
pedro
Labels
Clear labels   
Compat/Breaking

Breaking change that won't be backward compatible

  
Kind/Bug

Something is not working

  
Kind/Documentation

Documentation changes

  
Kind/Enhancement

Improve existing functionality

  
Kind/Feature

New functionality

  
Kind/Security

This is security issue

  
Kind/Testing

Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

  
Test Deployed

this PR is deployed in a domain, so you can see

No labels
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Test Deployed
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: ereuse/devicehub-django#61
No description provided.
Delete branch "rework/lots"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?