Oliver Walters 
							
						 
					 
					
						
						
							
						
						f451d31f00 
					 
					
						
						
							
							Rearrange stockitem drop-down menu for more logical operations  
						
						
						
						
					 
					
						2019-04-12 23:10:47 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e560ea4a41 
					 
					
						
						
							
							Update edit form for StockItem  
						
						... 
						
						
						
						- Disallow direct quantity editing (must perform stocktake)
- Add notes field to allow editing 
						
						
					 
					
						2019-04-12 23:10:32 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7566c3769a 
					 
					
						
						
							
							Added a note for future work  
						
						
						
						
					 
					
						2019-04-12 23:05:12 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						68ec5df371 
					 
					
						
						
							
							Correctly handle StockTrackingItem if there is no user data  
						
						
						
						
					 
					
						2019-04-12 23:03:02 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						738afa264a 
					 
					
						
						
							
							Merge branch 'stock-fix'  
						
						
						
						
					 
					
						2019-04-12 22:48:55 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						20acf1f692 
					 
					
						
						
							
							Merge pull request  #101  from SchrodingersGat/stock-fix  
						
						... 
						
						
						
						Fixes error in StockItem serializer 
						
						
					 
					
						2019-04-12 22:48:30 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						88103b63d2 
					 
					
						
						
							
							Cannot filter by STATUS  
						
						... 
						
						
						
						- Is this because it is a dict?
- Need to address this in the future 
						
						
					 
					
						2019-04-12 22:46:48 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7a7b0aea33 
					 
					
						
						
							
							Changed 'stocklocation.items' to 'stocklocation.stock_items'  
						
						
						
						
					 
					
						2019-04-12 22:46:15 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						426f460916 
					 
					
						
						
							
							Merge pull request  #100  from SchrodingersGat/master  
						
						... 
						
						
						
						Updated to django 2.2 
						
						
					 
					
						2019-04-12 22:43:48 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						84d2d2e45b 
					 
					
						
						
							
							Changed 'stocklocation.items' to 'stocklocation.stock_items'  
						
						
						
						
					 
					
						2019-04-12 22:43:22 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2d21bf0626 
					 
					
						
						
							
							Part BOM list now shows how many of each sub-item are available  
						
						... 
						
						
						
						- If there are enough to build the available quantity is shown in green
- Otherwise, shown in orange 
						
						
					 
					
						2019-04-12 22:09:50 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8a3706dd76 
					 
					
						
						
							
							Added MPN field to supplier part lists  
						
						
						
						
					 
					
						2019-04-12 21:54:53 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						25f1d643b8 
					 
					
						
						
							
							Add indicator to show no stock in part listing  
						
						
						
						
					 
					
						2019-04-12 21:21:50 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7341fe4542 
					 
					
						
						
							
							Fix modal form for creating company  
						
						
						
						
					 
					
						2019-04-12 21:09:31 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c67dc6f56e 
					 
					
						
						
							
							Initial updates required to run under django 2.2  
						
						... 
						
						
						
						- Change to middleware.py
- Change some URLs formatting
- Fix django version at 2.2 
						
						
					 
					
						2019-04-12 20:44:22 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						ceea053368 
					 
					
						
						
							
							Added part API  
						
						... 
						
						
						
						- Build allocation table now makes use of this API
- Further steps towards allocation table 
						
						
					 
					
						2018-05-12 12:44:29 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						1b9c98ae3e 
					 
					
						
						
							
							Bug fix for stock item traking list  
						
						... 
						
						
						
						- Query was returning ALL stock tracking objects!
- Now filter by StockItem ID 
						
						
					 
					
						2018-05-10 21:27:41 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						4b4db50de5 
					 
					
						
						
							
							Display username in stock-tracking  
						
						... 
						
						
						
						- Add UserSerializer 
						
						
					 
					
						2018-05-10 21:20:12 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						dcf74292b6 
					 
					
						
						
							
							Changed tracking into to datetime field  
						
						... 
						
						
						
						- Added moment.js for formatting dates
- 
						
						
					 
					
						2018-05-10 21:13:36 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						7b478fed4e 
					 
					
						
						
							
							Redirect if not authed  
						
						... 
						
						
						
						If user not logged in, redirect any requests to login page 
						
						
					 
					
						2018-05-10 20:40:08 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						57713556d1 
					 
					
						
						
							
							Revert default db to sqlite3 (for now)  
						
						
						
						
					 
					
						2018-05-10 19:19:13 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						07f16d8891 
					 
					
						
						
							
							Small improvements for build display  
						
						... 
						
						
						
						Working toward build management 
						
						
					 
					
						2018-05-09 22:02:56 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						690ec83265 
					 
					
						
						
							
							Woohoo for .then  
						
						
						
						
					 
					
						2018-05-09 21:48:36 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						517569f510 
					 
					
						
						
							
							Clicking on logo returns user to index page  
						
						
						
						
					 
					
						2018-05-09 00:19:34 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						7644617af0 
					 
					
						
						
							
							Better string formatting for models  
						
						... 
						
						
						
						Allows for easier searching in drop-downs for ForeignKeys 
						
						
					 
					
						2018-05-09 00:17:39 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						233f093093 
					 
					
						
						
							
							Update supplier part detail page  
						
						... 
						
						
						
						- Consolidated buttons into dropdown
- Make look like other pages 
						
						
					 
					
						2018-05-09 00:12:21 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						2c953c73fa 
					 
					
						
						
							
							Stock tracking tweaks  
						
						... 
						
						
						
						- Ability to stocktake for entire part
- Enforce addition of notes to stockAdjust modal 
						
						
					 
					
						2018-05-09 00:06:35 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						8000affeee 
					 
					
						
						
							
							Basic Index and Search endpoints  
						
						... 
						
						
						
						Index at /index/
Search at /search/
Search view accepts POST requests with search data 
						
						
					 
					
						2018-05-08 23:44:51 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c821d22b87 
					 
					
						
						
							
							Skeleton for 'index' and 'search' pages  
						
						
						
						
					 
					
						2018-05-08 23:26:32 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						552953a1f8 
					 
					
						
						
							
							Added bootstrap font files  
						
						... 
						
						
						
						Also added 'search' button 
						
						
					 
					
						2018-05-08 23:26:09 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						16b14c02d5 
					 
					
						
						
							
							Merge branch 'login'  
						
						
						
						
					 
					
						2018-05-08 23:14:16 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						84efaba920 
					 
					
						
						
							
							Add link to admin page  
						
						... 
						
						
						
						- Only if user is admin! 
						
						
					 
					
						2018-05-08 23:14:07 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						3cf45f5ed3 
					 
					
						
						
							
							Added Login and Logout buttons to NavBar  
						
						
						
						
					 
					
						2018-05-08 23:09:52 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						47aa3c8a45 
					 
					
						
						
							
							Login / Logout views  
						
						... 
						
						
						
						Information found here - https://simpleisbetterthancomplex.com/tutorial/2016/06/27/how-to-use-djangos-built-in-login-system.html  
						
						
					 
					
						2018-05-08 23:00:27 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						fdf35bd741 
					 
					
						
						
							
							Fixes for double-submit on butons  
						
						... 
						
						
						
						- Function that first unbinds the submit button 
						
						
					 
					
						2018-05-08 22:49:23 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						bf4ffb8b0b 
					 
					
						
						
							
							Add part stocktake to Stock Location page(s)  
						
						
						
						
					 
					
						2018-05-08 22:41:52 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						f2982a59ad 
					 
					
						
						
							
							Added StockTracking API  
						
						... 
						
						
						
						/api/stock/track/
ListCreate API view
StockItem page now shows bootrap-table of tracking notes 
						
						
					 
					
						2018-05-08 22:30:32 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						002c047105 
					 
					
						
						
							
							Added count/add/remove to Part Stock Detail Page  
						
						
						
						
					 
					
						2018-05-08 22:14:18 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						3b6ef3f008 
					 
					
						
						
							
							Added stocktake / add / remove actions to StockItemDetail page  
						
						
						
						
					 
					
						2018-05-08 22:14:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						25e0de1ce7 
					 
					
						
						
							
							Vast improvements to stocktake API endpoint  
						
						... 
						
						
						
						- Also acts to ADD and REMOVE stock
- Send 'action' field to specify which one to perform
- Fixed add_stock and remove_stock funcs for StockItem model
- Autoatically add transaction notes for all actions 
						
						
					 
					
						2018-05-08 22:06:28 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						ca2d3a1a7b 
					 
					
						
						
							
							Consolidated modal code  
						
						... 
						
						
						
						- Default modal passed down through the chain 
						
						
					 
					
						2018-05-08 20:46:23 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						054892aea2 
					 
					
						
						
							
							Cleaner handling of default modal param  
						
						
						
						
					 
					
						2018-05-08 19:58:38 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						3f1c6e2059 
					 
					
						
						
							
							Simplified modal calls  
						
						... 
						
						
						
						- Default modal target supplied (can be overridden in options) 
						
						
					 
					
						2018-05-08 19:55:39 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c5155d5ac7 
					 
					
						
						
							
							Move modal JS file  
						
						... 
						
						
						
						- Loaded by base. 
						
						
					 
					
						2018-05-08 19:40:29 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						ee0c664d28 
					 
					
						
						
							
							Prevent modals from firing multiple events  
						
						... 
						
						
						
						- e.g. if the modal has been open and closed multiple times!
- Detach all previously attached events 
						
						
					 
					
						2018-05-07 23:46:41 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						fdf214626c 
					 
					
						
						
							
							Further assorted updates  
						
						... 
						
						
						
						What, you need more commit details?! Pah 
						
						
					 
					
						2018-05-07 23:40:17 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						b6944620dd 
					 
					
						
						
							
							Fixes for JSON API  
						
						... 
						
						
						
						- Set content type
- Stringify JSON data
- Finish API to stocktake multiple parts 
						
						
					 
					
						2018-05-07 23:25:47 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						1363fa9f1f 
					 
					
						
						
							
							Prevent modals from automatically closing  
						
						
						
						
					 
					
						2018-05-07 22:16:05 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						17ecb59dbb 
					 
					
						
						
							
							Move to using postgresql  
						
						... 
						
						
						
						- Need to write a shell script to automate db install
- For now:
   - https://gist.github.com/sirodoht/f598d14e9644e2d3909629a41e3522ad 
   - https://www.digitalocean.com/community/tutorials/how-to-use-postgresql-with-your-django-application-on-ubuntu-14-04  
						
						
					 
					
						2018-05-07 22:03:13 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						425db5fd39 
					 
					
						
						
							
							Tweaked part stock page  
						
						
						
						
					 
					
						2018-05-07 21:51:08 +10:00