315 phase 4 status report #368
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jaredatron
suggested changes
Oct 4, 2017
backoffice/index.js
Outdated
| }) | ||
| .then(users => { | ||
| const userIds = users.map(user => user.id) | ||
| return knex |
There was a problem hiding this comment.
this should be moved to /database/queries.js
| @@ -2,6 +2,7 @@ require('../environment') | |||
| const { IDMClient } = require('./idm') | |||
| const { EchoClient } = require('./echo') | |||
| const hubspot = require('./hubspot') | |||
| const knex = require('../database/knex') | |||
There was a problem hiding this comment.
please remove this and all the changes to this file. i dont think we need them
| const setStatus = ({user_id, status}) => | ||
| logStatusUpdate({user_id, status}) | ||
| .then(() => { | ||
| const insert = knex('phase_4_status').insert({ |
There was a problem hiding this comment.
this looks good. We really need an upsert knex helper function. we have this complexity at least twice now
| @@ -0,0 +1,11 @@ | |||
|
|
|||
| table.string('status').notNullable() | ||
| table.timestamp('updated_at') | ||
| }) | ||
|
|
| @@ -1,4 +1,14 @@ | |||
| .users | |||
| &-status > * | |||
| display: inline-block | |||
There was a problem hiding this comment.
are you trying to run things inline horizontally? consider flexbox?
| textarea(name='status' rows='6' cols='70') | ||
| button.btn.btn-default(type='submit') Update | ||
| h3 Phase #{phase.number} Status Reports | ||
| +usersList(users.filter(u => u.phase === 4)) |
There was a problem hiding this comment.
do this phase 4 filter in the route and remove the mixin in favor of just for user in users
|
make these changes and then resubmit a PR. Also don't forget to rebase your other branch off the new version of this branch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
issue: https://github.com/LearnersGuild/curriculum/issues/315