Tenders and contracts lists pages for Dashboards module #3053

eltercero · 2020-05-11T10:56:49Z

✌️ What does this PR do?

Integrates the markup done is #3028 with the remote csv data defined in Gobierto Dashboard settings. This PR enables several new pages for Contracts and Tenders dashboard in the main site:

Summary
Contracts index
Contract details
Tenders index
Tender details

Some parts, like the filters and the summary, are empty on purpose since this is still a work in progress.

Navigation should work between main parts (Summary ,Tenders and Contracts) and within the details page of every contract/tender.

🔍 How should this be manually tested?

It's available in staging: https://burjassot.gobify.net/dashboards/contratos/resumen

👀 Screenshots

Does this PR changes any configuration file?

new environment variable in .env.example?
new entry in config/application.yml?
new entry in config/secrets.yml?

(Changes in these files might need to update the role in Ansible)

📖 Does this PR require updating the documentation?

new site configuration variable?
new site template?
new module/submodule settings?
significant changes in some feature?

ferblape

Hey! It looks great, just a few details (they can be fixed here or open a new issue if you prefer):

format the prices with locale separators and units. You can check how it's been implemeted in Mataro investments
if I'm in a contract or a tender, I'd expect the navigation option to be active:

data should be sorted by date ASC. You can't trust it will be sorted in the CSV
in contracts item page add the disccount %. Anyway I'm creating a new issue with more columns we could display to make it more interesting

Crashillo

There are two CSV files commited, is that right?

app/assets/stylesheets/module-dashboards.scss

app/javascript/gobierto_dashboards/modules/contracts_controller.js

Crashillo · 2020-05-12T10:19:13Z

app/javascript/gobierto_dashboards/webapp/mixins/store.js

@@ -0,0 +1,8 @@
+export const store = {


@ferblape Rethink if we should redeclare all this kind of things by module

app/views/gobierto_dashboards/dashboards/contracts.html.erb

config/locales/gobierto_dashboards/views/ca.yml

config/locales/gobierto_dashboards/views/en.yml

eltercero · 2020-05-12T14:36:36Z

@ferblape since there is a new issue for the new columns, I'll do the last thing there if that's ok! The other things you mentioned are now fixed.

Routing and nav are not great atm though. I'll redo them after I talk with @Crashillo.

ferblape · 2020-05-13T06:48:06Z

app/javascript/gobierto_dashboards/webapp/lib/config.js

@@ -0,0 +1,12 @@
+export const contractsColumns = [


Should we move the columns to the module configuration JSON?

Is this JSON config already available from de API? Our initial idea was fetch the site metadata from XHR call (because it should be stored in DB), instead having a json config file in the code

app/views/gobierto_dashboards/dashboards/contracts.html.erb

- Renaming routes to the Spanish equivalents - Removing "tenders" route since it's actually inside "contracts". - Removing index route because it won't be neccessary

… if disabled.

And removing them from data()

…(contract show and tender show)

Fixing specs too, since the default order changed and now everything is properly formatted.

eltercero · 2020-05-13T15:04:57Z

Things left to be done in other issues:

Check if we can change axios for d3.
Add slots to the Index > Table > TableRow components
Remove duplicated code in ContractsIndex and TendersIndex if TendersIndex remains.
Move contracts and tendersData to props in router

@ferblape if everything else is correct I'll merge it

eltercero · 2020-05-14T07:17:40Z

@ferblape is the review finished? can I merge it?

ferblape · 2020-05-14T07:45:39Z

Yep 🚀

Crashillo · 2020-05-14T07:47:22Z

Wait wait wait

Crashillo · 2020-05-14T07:48:42Z

Blat the Kid, the fastest merge on this side of the Mississipi

app/javascript/gobierto_dashboards/modules/contracts_controller.js

app/javascript/gobierto_dashboards/webapp/components/TableRow.vue

app/javascript/gobierto_dashboards/webapp/containers/contract/ContractsIndex.vue

app/javascript/gobierto_dashboards/webapp/containers/shared/Nav.vue

app/javascript/gobierto_dashboards/webapp/lib/get_remote_data.js

app/javascript/gobierto_dashboards/webapp/lib/utils.js

To avoid using _self as this. Also (not related), adding destructuring.

eltercero · 2020-05-14T08:55:33Z

@Crashillo I think everything is either done or postponed (:P), can you check again?

Crashillo · 2020-05-14T11:50:52Z

app/javascript/gobierto_dashboards/modules/contracts_controller.js

+ { path: "/dashboards/contratos", component: Home,
+ children: [
+ { path: "resumen", name: "summary", component: Summary },
+ { path: "contratos", name: "contracts_index", component: ContractsIndex },
+ { path: "contratos/:id", name: "contracts_show", component: ContractsShow },
+ { path: "licitaciones", name: "tenders_index", component: TendersIndex },
+ { path: "licitaciones/:id", name: "tenders_show", component: TendersShow },
+ ]


@eltercero Don't you tell me you gonna add the props here?

Yes, but I'll do it in the latest issue on development to avoid conflicts in three separate branches #3053 (comment)

eltercero requested review from ferblape, entantoencuanto, Crashillo and jorgeatgu May 11, 2020 10:56

ferblape requested changes May 12, 2020

View reviewed changes

Crashillo requested changes May 12, 2020

View reviewed changes

eltercero force-pushed the 2997-tenders-contracts-lists-pages branch from a146709 to 981efb9 Compare May 12, 2020 14:32

eltercero mentioned this pull request May 12, 2020

Summary main stats page for Dashboards #3057

Merged

7 tasks

ferblape reviewed May 13, 2020

View reviewed changes

eltercero force-pushed the 2997-tenders-contracts-lists-pages branch from 264f8d7 to bc1b444 Compare May 13, 2020 09:03

ferblape reviewed May 13, 2020

View reviewed changes

app/views/gobierto_dashboards/dashboards/contracts.html.erb Outdated Show resolved Hide resolved

eltercero added 18 commits May 13, 2020 17:02

Several changes in routes and controller actions

6655123

- Renaming routes to the Spanish equivalents - Removing "tenders" route since it's actually inside "contracts". - Removing index route because it won't be neccessary

Views and controller with the proper info from the module settings

cc2cac7

Vue integration: Base containers and functional navigation

fc25f67

Initial table and table row views integration for contracts and tenders

00b2c14

Integration tests for contracts and tenders lists.

702f18b

Adding a test that checks that the dashboards pages can't be accessed…

44f791c

… if disabled.

Removing missing console.log

0d4490c

Format money strings with correct punctuation and currency.

23297ec

Removing unused method

00038de

Removing unused component

3b2217a

Wrong class name due to copy paste

956f355

Locale files changes

8698f73

Removing unused component

d17d69a

Sorting contracts and tenders by date ASC

cfbfcb2

Always search for the item based on the id.

f836808

Moving i18n string initialization from created() hook to data().

1e99e5c

Destructuring attributes in v-for

6bab14b

Moving columns configuration to its own file

53329be

And removing them from data()

eltercero added 5 commits May 13, 2020 17:02

Moving get_remote_data inside /lib

28f7482

Fix navigation bar so it highlights the current tab in details pages …

42ad214

…(contract show and tender show)

Adding format to tender show as well

89d3449

Fixing specs too, since the default order changed and now everything is properly formatted.

Replacing hardcoded routing methods with router-link

f362a3f

Typo fix.

8901ed9

eltercero force-pushed the 2997-tenders-contracts-lists-pages branch from 5bc9733 to 8901ed9 Compare May 13, 2020 15:02

Crashillo requested changes May 14, 2020

View reviewed changes

eltercero added 2 commits May 14, 2020 10:11

Removing d3 since it won't be used for now.

871e16d

Changing function to arrow function

a1957e1

To avoid using _self as this. Also (not related), adding destructuring.

eltercero requested a review from Crashillo May 14, 2020 10:18

Crashillo reviewed May 14, 2020

View reviewed changes

Crashillo approved these changes May 14, 2020

View reviewed changes

eltercero requested a review from Crashillo May 14, 2020 12:45

eltercero merged commit 1143329 into master May 14, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tenders and contracts lists pages for Dashboards module #3053

Tenders and contracts lists pages for Dashboards module #3053

eltercero commented May 11, 2020

ferblape left a comment •

edited by eltercero

Loading

Crashillo left a comment

Crashillo May 12, 2020

eltercero commented May 12, 2020

ferblape May 13, 2020

Crashillo May 13, 2020

eltercero commented May 13, 2020 •

edited

Loading

eltercero commented May 14, 2020

ferblape commented May 14, 2020

Crashillo commented May 14, 2020

Crashillo commented May 14, 2020

eltercero commented May 14, 2020

Crashillo May 14, 2020

eltercero May 14, 2020

Tenders and contracts lists pages for Dashboards module #3053

Tenders and contracts lists pages for Dashboards module #3053

Conversation

eltercero commented May 11, 2020

✌️ What does this PR do?

🔍 How should this be manually tested?

👀 Screenshots

Does this PR changes any configuration file?

📖 Does this PR require updating the documentation?

ferblape left a comment • edited by eltercero Loading

Choose a reason for hiding this comment

Crashillo left a comment

Choose a reason for hiding this comment

Crashillo May 12, 2020

Choose a reason for hiding this comment

eltercero commented May 12, 2020

ferblape May 13, 2020

Choose a reason for hiding this comment

Crashillo May 13, 2020

Choose a reason for hiding this comment

eltercero commented May 13, 2020 • edited Loading

eltercero commented May 14, 2020

ferblape commented May 14, 2020

Crashillo commented May 14, 2020

Crashillo commented May 14, 2020

eltercero commented May 14, 2020

Crashillo May 14, 2020

Choose a reason for hiding this comment

eltercero May 14, 2020

Choose a reason for hiding this comment

ferblape left a comment •

edited by eltercero

Loading

eltercero commented May 13, 2020 •

edited

Loading