Ks 2022 09 support phase #4545

Rineee · 2022-10-05T14:22:58Z

@fuzzylogic2000 Maybe you already want to have a look, especially the rules (left it all in mb for now), but there a still some todos:

remove ratings from list view (-> add supoort there?)
remove ratings from map pop up (-> add support there?)
change filter wording for support phase

Not even sure about the 'adding support' part of the first two here, is that included in the story? Not explicitly at least :)

fuzzylogic2000

Looks good! Even though there is still the stuff we need to think about and handle, it looks like a good way to me

meinberlin/apps/budgeting/rules.py

meinberlin/apps/budgeting/assets/SupportBox.jsx

meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_detail.html

fuzzylogic2000

@Rineee I thought handling as much as possible in the python code is a good idea? Then it's also easy to change when the logic when we show what is changed. (like in another phase as well or between certain ones or whatever.) What do you think?

fuzzylogic2000 · 2022-10-14T14:35:21Z

meinberlin/apps/budgeting/assets/BudgetingProposalListItem.jsx

-          commentCount={proposal.comment_count}
-        />
-      )}
+      <ListItemStats


We can remove is_voting_phase from the template tag as we have only used it here. But it is still in the tests, so they will definitely break. And I cannot remember how to fix them. Can you show me again @khamui or @goapunk ?

…eprint

…sal detail template

… phase

Rineee · 2022-10-17T10:07:27Z

@Rineee I thought handling as much as possible in the python code is a good idea? Then it's also easy to change when the logic when we show what is changed. (like in another phase as well or between certain ones or whatever.) What do you thin

@fuzzylogic2000 Really cool, I like it this way. I also tried to fix the frontend tests, hope the right way 🙈 I would say we could merge now and do the pop up part once it is fixed?

fuzzylogic2000 · 2022-10-17T11:32:18Z

@Rineee I thought handling as much as possible in the python code is a good idea? Then it's also easy to change when the logic when we show what is changed. (like in another phase as well or between certain ones or whatever.) What do you thin

@fuzzylogic2000 Really cool, I like it this way. I also tried to fix the frontend tests, hope the right way see_no_evil I would say we could merge now and do the pop up part once it is fixed?

@Rineee Yes, I think merging now and fixing the map popups in the second map is a good idea! But I think one of @phillimorland @khamui and @goapunk should also approve and do the merging. :)

philli-m · 2022-10-17T13:33:58Z

meinberlin/apps/budgeting/assets/__tests__/ListItemStats.jest.jsx

-test('displaying all 3 stats', () => {
+test('rating displaying all 3 stats', () => {
+  const permissions = {
+    view_support_count: false,


should this be true to show all 3 stats or have I misunderstood the name?

Hmm, as we never show all stats on the real list, I don't know. Maybe there should be two tests, one showing the supports and the other one the rating?

then we can change the description of this test to rating phase showing 2 stats

oh no, overread that. Yes!

@phillimorland @fuzzylogic2000 So this test is testing if its showing all 3 stats (pos, neg, comments) when there is a rating phase and the other one below is testing that only 2 are shown (pos, comments) when there is support.. does that make sense?

So it is true to show all 3, see lines 20-25.

Yes, cool. Just delete the task again. :)

philli-m

@fuzzylogic2000 @Rineee code looks good and tests pass, just one quick question about the 3 stats. Also should the default phase descriptions in dashboard be updated? and also how do I give myself support permission? couldn't figure that out in dashboard

fuzzylogic2000 · 2022-10-17T14:01:24Z

@fuzzylogic2000 @Rineee code looks good and tests pass, just one quick question about the 3 stats. Also should the default phase descriptions in dashboard be updated? and also how do I give myself support permission? couldn't figure that out in dashboard

@phillimorland Oh, sorry, should have said! The supporting only works with a new 3 phase Bürgerhaushalt as the old one still has the old phase.

philli-m · 2022-10-17T14:50:49Z

@fuzzylogic2000 @Rineee code looks good and tests pass, just one quick question about the 3 stats. Also should the default phase descriptions in dashboard be updated? and also how do I give myself support permission? couldn't figure that out in dashboard

@phillimorland Oh, sorry, should have said! The supporting only works with a new 3 phase Bürgerhaushalt as the old one still has the old phase.

@fuzzylogic2000 cheers, looks good, only thing is the support and the moderation buttons are on 2 separate lines but that can be fixed later so LGTM from me :)

fuzzylogic2000 · 2022-10-17T15:13:32Z

I will add a task about the button and merge.

Rineee · 2022-10-18T08:35:58Z

@fuzzylogic2000 @Rineee code looks good and tests pass, just one quick question about the 3 stats. Also should the default phase descriptions in dashboard be updated? and also how do I give myself support permission? couldn't figure that out in dashboard

@phillimorland Oh, sorry, should have said! The supporting only works with a new 3 phase Bürgerhaushalt as the old one still has the old phase.

@fuzzylogic2000 cheers, looks good, only thing is the support and the moderation buttons are on 2 separate lines but that can be fixed later so LGTM from me :)

Oh yes, I saw that and then ignored it 🙈 Good you pointed it out again @phillimorland

Rineee changed the title ~~Ks 2022 09 support phase~~ WIP Ks 2022 09 support phase Oct 5, 2022

fuzzylogic2000 reviewed Oct 7, 2022

View reviewed changes

meinberlin/apps/budgeting/rules.py Show resolved Hide resolved

meinberlin/apps/budgeting/assets/SupportBox.jsx Show resolved Hide resolved

meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_detail.html Show resolved Hide resolved

fuzzylogic2000 reviewed Oct 14, 2022

View reviewed changes

rine and others added 4 commits October 17, 2022 11:03

budgeting: add support phase with respective rules and use in PB3 blu…

c47d600

…eprint

budgeting: add SupportBox component with templatetag and use in propo…

6abde03

…sal detail template

apps/budgeting: add stats info to api and only show when defined

df680ba

apps/budgeting: add support sorting to ordering filter during support…

9dfd077

… phase

Rineee force-pushed the ks-2022-09-support-phase branch from 4bf9709 to 9dfd077 Compare October 17, 2022 09:07

budgeting: fix and add frontend tests

d71a083

Rineee changed the title ~~WIP Ks 2022 09 support phase~~ Ks 2022 09 support phase Oct 17, 2022

fuzzylogic2000 requested review from khamui, philli-m and goapunk October 17, 2022 11:32

philli-m self-assigned this Oct 17, 2022

philli-m reviewed Oct 17, 2022

View reviewed changes

philli-m removed their assignment Oct 17, 2022

fuzzylogic2000 merged commit d2ccd36 into main Oct 17, 2022

fuzzylogic2000 deleted the ks-2022-09-support-phase branch October 17, 2022 15:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ks 2022 09 support phase #4545

Ks 2022 09 support phase #4545

Rineee commented Oct 5, 2022 •

edited by fuzzylogic2000

Loading

fuzzylogic2000 left a comment

fuzzylogic2000 left a comment

fuzzylogic2000 Oct 14, 2022

Rineee commented Oct 17, 2022

fuzzylogic2000 commented Oct 17, 2022

philli-m Oct 17, 2022 •

edited

Loading

fuzzylogic2000 Oct 17, 2022

philli-m Oct 17, 2022

fuzzylogic2000 Oct 17, 2022

Rineee Oct 18, 2022

Rineee Oct 18, 2022

fuzzylogic2000 Oct 18, 2022

philli-m left a comment

fuzzylogic2000 commented Oct 17, 2022

philli-m commented Oct 17, 2022

fuzzylogic2000 commented Oct 17, 2022

Rineee commented Oct 18, 2022

Ks 2022 09 support phase #4545

Ks 2022 09 support phase #4545

Conversation

Rineee commented Oct 5, 2022 • edited by fuzzylogic2000 Loading

fuzzylogic2000 left a comment

Choose a reason for hiding this comment

fuzzylogic2000 left a comment

Choose a reason for hiding this comment

fuzzylogic2000 Oct 14, 2022

Choose a reason for hiding this comment

Rineee commented Oct 17, 2022

fuzzylogic2000 commented Oct 17, 2022

philli-m Oct 17, 2022 • edited Loading

Choose a reason for hiding this comment

fuzzylogic2000 Oct 17, 2022

Choose a reason for hiding this comment

philli-m Oct 17, 2022

Choose a reason for hiding this comment

fuzzylogic2000 Oct 17, 2022

Choose a reason for hiding this comment

Rineee Oct 18, 2022

Choose a reason for hiding this comment

Rineee Oct 18, 2022

Choose a reason for hiding this comment

fuzzylogic2000 Oct 18, 2022

Choose a reason for hiding this comment

philli-m left a comment

Choose a reason for hiding this comment

fuzzylogic2000 commented Oct 17, 2022

philli-m commented Oct 17, 2022

fuzzylogic2000 commented Oct 17, 2022

Rineee commented Oct 18, 2022

Rineee commented Oct 5, 2022 •

edited by fuzzylogic2000

Loading

philli-m Oct 17, 2022 •

edited

Loading