[WIP] Suppliers #656
Merged
[WIP] Suppliers #656
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
|
Looks very good, would love if we could go over the main points tomorrow together! |
… to camps, and fix lang support
# Conflicts: # app.js
|
resolved conflict in page.jade: I have made some changes in the nav. have added suppliers to top-nav in ui-style-fix branch. should be good once they are both merged to master |
…amp suppliers (currently not in use). added camp suppliers to view camp details page
# Conflicts: # app.js # locales/he/suppliers.json # migrations/20180211232239_suppliers.js # models/constants.js # models/suppliers.js # routes/api/api_suppliers_routes.js # routes/index.js # views/pages/suppliers/edit.jade
* Move utility function in api_camps_routes to services. Fix linting Replace vars with const and let. * Initial structure (using routers and controllers) * Refactor api_camp_routes Refactor api_events_routes * Refactor api_routes (auth) * Refactor public camp routes * Fix an error in jade file Connect new API router to main app. * Add comments to index * Fix 404 redirect * Truly fix 404 * Add S3 changes to new refactored api * Fix lint * Merge fixs * Add DGS date columns to admin edit (GUI only) * Add DGS column to camps. Add DGS column to admin camps management table. Add disabled logic (for both quota columns). E2E - add dates to event, see the column is not disabled, add dgs tickets. * Handle dates in event editing * Add separation in camp edit statistics between ticket types Fix counts of statistics (total in camps, allocated, allocated by ticket etc...) Add dgs to B.E. Validate adding tickets and removing tickets * Fix counts * Fix lint * Initial work on camp edit disabling * Implement disabling camp-manager page * Handle no event rules found (fix test) * continuous deployment from api-refactor-feb-2018 to sparktesting environment (#770) * Merge DGS changes * Merge suppliers * Fix Lint Fix Merge * Fix lint * Merge fixs * Fix JSON * Added Supplier entries route and initial view file * Broken progress commit * Initial work on supplier entries page * Add some fields * Add some fields * Add functionaly to view entries Add functionality to add/exit entry validate data on adding entry * Add table sorting. Add overdue class (lines are red if supplier is overdue) * Translation fix Smaller sorting icon * Lint fix CSS add-on
* Supplier contracts - WIP * Drop unneeded column * Add SupplierContract model * Add a bucket for supplier contracts * Resolving rebase conflict * Resolving rebase conflict * Add checking for existing supplier; Insert or update the contract in the DB * Add a route for GETting supplier contract (#803) * Add a route for DELETing supplier contract (#803) * Improvements - supplier contract management (#803) - Change the type of supplier_id column to string - Change the column name of contract file to `file_name` * Improvements - supplier contract management (#803) - Add routes documentation - Limit access to camp admins - Change a contract column name to `file_name` * Delete extraneous userRole declaration (#803)
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.
Proposed solution
Tradeoffs
Testing Done