Markup for phase editing in groups #1248

furilo · 2017-12-12T09:05:20Z

Closes #1234 #1236 #1141 #1237 #1239 #1235 #1238

What does this PR do?

Markup for phase editing
Implementation

How should this be manually tested?

Markup: Browse to http:https://madrid.gobierto.dev/sandbox/admin_part_group

Alvaro's revision

Add to select News and Documents
Change Meetings with Agenda
New issue Link phases with pages (select2)
New tab phases
Change “Titulo de una fase”, “Descripción de una fase”
Not include “CTA box” and “Phases Map” when is group, also the dates of the phases.
New issue -> Highlight open phases

codecov-io · 2017-12-12T09:19:51Z

Codecov Report

Merging #1248 into master will decrease coverage by 0.31%.
The diff coverage is 76.47%.

@@            Coverage Diff             @@
##           master    #1248      +/-   ##
==========================================
- Coverage   77.39%   77.08%   -0.32%     
==========================================
  Files         464      469       +5     
  Lines       12162    12354     +192     
==========================================
+ Hits         9413     9523     +110     
- Misses       2749     2831      +82

Impacted Files	Coverage Δ
...pation/processes/process_stages_sort_controller.rb	`0% <0%> (ø)`
...odels/gobierto_participation/process_stage_page.rb	`100% <100%> (ø)`
...ers/gobierto_participation/processes_controller.rb	`96.29% <100%> (-3.71%)`	⬇️
app/models/gobierto_cms/page.rb	`86.58% <100%> (+0.16%)`	⬆️
...ierto_admin/gobierto_participation/process_form.rb	`85.54% <100%> (-3.59%)`	⬇️
...min/gobierto_participation/processes_controller.rb	`79.71% <40%> (-7.39%)`	⬇️
...p/helpers/gobierto_participation/process_helper.rb	`69.23% <69.23%> (ø)`
...pation/processes/process_stage_pages_controller.rb	`73.8% <73.8%> (ø)`
app/models/gobierto_participation/process_stage.rb	`68.29% <74.5%> (-25.33%)`	⬇️
...in/gobierto_participation/process_stages_helper.rb	`75% <75%> (ø)`
... and 15 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 493cec5...307d1e0. Read the comment docs.

ferblape

Good job!

Just review my comments. Most of them are scopes in the queries (we should avoid this error from now on ;)

And a couple of things:

When editing the phases of the process, in the breadcrumb the title of the process is not visible
When editing a stage in the breadcrumb says CMS
In Process model:
- next_stage should use the new ordering, not the date
- same with showcase_stage
- in current_stage: remove the comment
- self.open gets all the processes of all the sites. That method is quite dangerous. Is it used somewhere?
The URL of the Information and Results page should keep the user in the process. Now, it takes the user to the CMS section, and it should be the show action inside the process.

ferblape · 2017-12-28T07:24:15Z

app/assets/stylesheets/admin/application.scss

@@ -23,7 +23,7 @@
 @import "simplemde.min";
 @import "tipsy";
 @import "jqtree";
-@import "codemirror";
+// @import "codemirror";


Is this correct?

Alvaro, estuvo probando "Remove the Codemirror CSS temporarily to see how it feels"
7ae4ea9 @furilo, what do we do?

ferblape · 2017-12-28T07:29:17Z

...ontrollers/gobierto_admin/gobierto_participation/processes/process_stage_pages_controller.rb

+ private
+
+ def find_process_stage
+ ::GobiertoParticipation::ProcessStage.find(params[:process_stage_id])


Scope: current_process.stages.find...

ferblape · 2017-12-28T07:39:33Z

...ontrollers/gobierto_admin/gobierto_participation/processes/process_stage_pages_controller.rb

+ end
+
+ def find_process_stage_page
+ ::GobiertoParticipation::ProcessStagePage.find(params[:id])


Scope: @process_stage.process_stage_page...

ferblape · 2017-12-28T07:40:01Z

app/controllers/gobierto_admin/gobierto_participation/processes/process_stages_controller.rb

+ end
+
+ def find_process_stage
+ ::GobiertoParticipation::ProcessStage.find(params[:id])


ferblape · 2017-12-28T07:41:08Z

app/forms/gobierto_admin/gobierto_participation/process_form.rb

+ def build_information_stage
+ process.stages.build(
+ process: process,
+ title_translations: { 'en' => 'Information', 'es' => 'Información' },


Could we add Catalan?

ferblape · 2017-12-28T07:41:31Z

app/forms/gobierto_admin/gobierto_participation/process_stage_form.rb

+ end
+
+ def process
+ @process ||= GobiertoParticipation::Process.find_by(id: process_id)


current_site.processes

ferblape · 2017-12-28T07:43:51Z

app/helpers/gobierto_admin/gobierto_participation/process_stages_helper.rb

+module GobiertoAdmin
+ module GobiertoParticipation
+ module ProcessStagesHelper
+ def admin_stage_url(stage)


The method returns paths, it should be named admin_stage_path?

furilo · 2017-12-28T08:46:53Z

Alvaro, estuvo probando "Remove the Codemirror CSS temporarily to see how it feels" 7ae4ea9 <7ae4ea9> @furilo <https://github.com/furilo>, what do we do?

Don’t use it, we can remove the commented reference

…

-- http:https://twitter.com/furilo http:https://www.furilo.com

apradillap · 2017-12-28T13:24:13Z

@ferblape I've corrected all the "requested changes" except next_stage and showcase_stage in Process model that are returning stages 😄
Highlights: I deleted self.open dangerous method, I'll check the scopes in future PRs, thanks!!

ferblape · 2017-12-29T06:24:23Z

Thanks @apradillap just two more details I have just noticed:

"More information" button should only be visible if there's a phase with the Information tool published. Otherwise, the link is broken and raises this error: https://rollbar.com/Populate/gobierto/items/692/
The markup in the stages navigator for the first stage is wrong. In the example above the active stage is the second one, but the first stage is bold too, and the user can't distinguish which is the active stage.

Feel free to release after fixing these two issues 🚀

ferblape · 2017-12-29T06:27:01Z

Also @apradillap could you reference in the PR all the issues it closes? 1238, 1235....

…gator

Markup for phase editing in groups

3d04e45

furilo and others added 16 commits December 13, 2017 10:11

Reorg of elements in the phase listing

001bf9c

Markup for the new Tool Content

f221d0d

Remove the Codemirror CSS temporarily to see how it feels

7ae4ea9

First approximation project phases edition

94a3d84

First approach on the front of the modifications in the process phases

d843bb2

Merge branch 'master' into 1234-modify-info-about-phases

5096cc4

Refactor process stages with separate controller and relocate i18n keys

8f5afc0

Complete add/edit process stages form

b2dc8e3

Refactor current stage process without dates

a18bfe4

Merge branch 'master' into 1234-modify-info-about-phases

c2bf275

Fix test of process stages refactor

69a55d1

Fix menu subsections process tests

178389e

Add validations to process stages

8a5a283

Add stage in process creation and minors

b244865

Modify active stage and delete with javascript

4b02f7e

Clean and complete fix process stages tests

0d3a817

apradillap self-assigned this Dec 21, 2017

apradillap changed the title ~~Markup for phase editing in groups~~ [WIP] Markup for phase editing in groups Dec 21, 2017

apradillap added 10 commits December 21, 2017 16:53

Fix rubocop syntax

ff2ae85

Minor process stages changes

f263620

Add i18 keys to process stages

220bb2a

i18n normalize

675f051

Change i18n keys and add stage types

71f9c77

Complete stage types and custom fields in groups

2649c08

New stages tab in processes

be2137f

Fix process stages tests

9b71844

Add process_stages tests: create, update and delete

032c963

Fix model process stages tests

d8f5853

apradillap added 5 commits December 26, 2017 16:41

Associate pages with process stages

0382f4a

Fix admin_stage_url helper

51df95d

Delete process information attribute

76fb55d

Add process stage pages tests

e47308a

Merge branch 'master' into 1234-modify-info-about-phases

7ac081a

apradillap changed the title ~~[WIP] Markup for phase editing in groups~~ Markup for phase editing in groups Dec 27, 2017

apradillap requested a review from ferblape December 27, 2017 12:16

apradillap mentioned this pull request Dec 27, 2017

Highlight open phases #1279

Closed

ferblape requested changes Dec 28, 2017

View reviewed changes

apradillap added 2 commits December 28, 2017 12:50

Changes requested by @ferblape in the process stages

b9cee85

Merge branch 'master' into 1234-modify-info-about-phases

3e04d3f

apradillap added 4 commits December 29, 2017 11:02

Fix more information for process stages and markup in the stages navi…

d674c8a

…gator

Merge branch 'master' into 1234-modify-info-about-phases

b8d3253

Fix process description without conditional

7bf1637

Fix process attachment stages and stages map

307d1e0

apradillap merged commit 612ff08 into master Dec 29, 2017

apradillap deleted the 1234-modify-info-about-phases branch December 29, 2017 11:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Markup for phase editing in groups #1248

Markup for phase editing in groups #1248

furilo commented Dec 12, 2017 •

edited by ferblape

Loading

codecov-io commented Dec 12, 2017 •

edited

Loading

ferblape left a comment

ferblape Dec 28, 2017

apradillap Dec 28, 2017

ferblape Dec 28, 2017

ferblape Dec 28, 2017

ferblape Dec 28, 2017

ferblape Dec 28, 2017

ferblape Dec 28, 2017

ferblape Dec 28, 2017

furilo commented Dec 28, 2017 via email

apradillap commented Dec 28, 2017

ferblape commented Dec 29, 2017

ferblape commented Dec 29, 2017

Markup for phase editing in groups #1248

Markup for phase editing in groups #1248

Conversation

furilo commented Dec 12, 2017 • edited by ferblape Loading

What does this PR do?

How should this be manually tested?

Alvaro's revision

codecov-io commented Dec 12, 2017 • edited Loading

Codecov Report

ferblape 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

furilo commented Dec 28, 2017 via email

apradillap commented Dec 28, 2017

ferblape commented Dec 29, 2017

ferblape commented Dec 29, 2017

furilo commented Dec 12, 2017 •

edited by ferblape

Loading

codecov-io commented Dec 12, 2017 •

edited

Loading