bike/Yellow-Bike-Database-Mirror
1
0
Fork 0
mirror of https://github.com/fspc/Yellow-Bike-Database.git synced 2026-09-03 02:11:38 -04:00
Code Issues Projects Releases Wiki Activity
352 Commits 2 Branches 4 Tags
ff0bb290e262191dbcd5da9a94a132f56f083169
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Rosenbaum ff0bb290e2 Tests the free stand time callback. 2017-08-06 05:18:53 +00:00
Jonathan Rosenbaum fc694c4a87 Adds new stand time definition for free stand time period. 2017-08-06 05:17:58 +00:00
Jonathan Rosenbaum aab521eb6b Improves the max bike earned logic. 2017-08-05 22:01:02 +00:00
Jonathan Rosenbaum e852af5e5f Max Bike Earned logic now working. 2017-08-05 21:15:20 +00:00
Jonathan Rosenbaum fb0e9cfbfb Corrects some human introduced bugs by returned code to earlier state. 2017-08-05 19:22:02 +00:00
Jonathan Rosenbaum 3e18f89e65 Discount works properly when redeemable value is not greater than sweat equity limit. 
* Also, improved tabbing to take into account the spinner.
 2017-08-05 19:05:16 +00:00
Jonathan Rosenbaum 27ff8f87d2 Corrects an introduced bug where max is assigned a value, but obj.volunteer does not have a value assigned, yet. 2017-08-05 18:28:16 +00:00
Jonathan Rosenbaum 165b81adc5 Gives a 0 value when there is no vhr & vhr 2017-08-05 18:13:57 +00:00
Jonathan Rosenbaum 2f33f8eef8 If volunteer hours remaining is 0, spinner is disabled on spin or zeroed on input. 2017-08-05 06:44:59 +00:00
Jonathan Rosenbaum 17573c20e4 Adds new value to redeemable function, and comments unneccesary code in function. 2017-08-05 06:13:59 +00:00
Jonathan Rosenbaum 5e80aedca7 Fills in the blanks for volunteer hours remaining and redeemed in mouseover. 2017-08-05 05:49:25 +00:00
Jonathan Rosenbaum bc747c90a2 Creates new object when year changes. 2017-08-05 04:41:55 +00:00
Jonathan Rosenbaum 9e8ea84a0e Assigns 0.00 if redeemable_hours are NaN, and runs a test so info isn't shown esessentially for a non-volunteer. 2017-08-05 03:42:21 +00:00
Jonathan Rosenbaum 5047f59996 This uses tradition declaration notation rather than emacscript 6 notation, just for compatibility with older browsers. 2017-08-05 03:08:18 +00:00
Jonathan Rosenbaum b7f128feca Creates the object, and adds redeemed hours together. 2017-08-04 06:25:27 +00:00
Jonathan Rosenbaum aeb6b23889 Adds volunteer history update. 2017-08-04 06:24:54 +00:00
Jonathan Rosenbaum a48fb518f7 Saves redeemed hour value properly if previous edited transaction is saved again. 2017-08-03 21:39:08 +00:00
Jonathan Rosenbaum f95f2d2b2c This gets volunteer history select working correctly. 2017-08-03 21:23:13 +00:00
Jonathan Rosenbaum e6b05b4eab Callback to query Volunteer benefits history. 2017-08-03 21:10:25 +00:00
Jonathan Rosenbaum 086a87900a Adds delete_transaction id so that delete can be turned off for completed / saved transactions. 2017-08-03 21:09:33 +00:00
Jonathan Rosenbaum 8ed0677750 Now a previous saved transaction cannot be deleted. 2017-08-03 21:08:28 +00:00
Jonathan Rosenbaum 34e91b07bd Adds original_price span. 2017-08-03 20:28:34 +00:00
Jonathan Rosenbaum c1bde007b4 Minor text edit. 2017-08-03 20:27:53 +00:00
Jonathan Rosenbaum 63cecfc678 Fixes a minor bug introduced on first transaction for benefit transactions. 2017-08-03 20:26:47 +00:00
Jonathan Rosenbaum daf885cc4a Shows original price and redeemed volunteer hours for saved transaction when edit button is pressed. 2017-08-03 20:03:27 +00:00
Jonathan Rosenbaum 7147ea6213 Adds to new values (original_price and redeemed_hours) to the history for benefit transactions. 2017-08-03 19:44:38 +00:00
Jonathan Rosenbaum 04846ae362 Uses a new type for the volunteer column. 2017-08-03 03:29:35 +00:00
Jonathan Rosenbaum d0e88bac58 Turns off/on spinner for membership based on choices in functions. 2017-08-03 00:15:38 +00:00
Jonathan Rosenbaum d4cb86b3c0 Adds transactions_with_volunteer_benefits and transactions_with_membership_benefits. 
* Allows transactions to provide volunter and/or membership benefits
* Volunteer benefits take precedent for patrons with both types of benefits if a tranaction offers both.
 2017-08-02 22:27:39 +00:00
Jonathan Rosenbaum c214c48a3d Adds an additional check for Stand Time or nothing else works. 2017-08-02 22:07:03 +00:00
Jonathan Rosenbaum 2508653fef Shows amount if expired membership & status is stand time. 2017-08-02 21:27:34 +00:00
Jonathan Rosenbaum 23d8bcf60e Adds the correct conversion for Stand Time transactions, still limited like normal transactions. 2017-08-02 21:15:11 +00:00
Jonathan Rosenbaum bd00d498f1 Corrects a bug, by returning a deleted value. 2017-08-02 20:27:13 +00:00
Jonathan Rosenbaum 1c6508abd0 This corrects the math for all situations. 2017-08-02 20:16:17 +00:00
Jonathan Rosenbaum a225aacda4 Adds the discount math. One unimportant bug created which will be fixed. 2017-08-02 09:15:11 +00:00
Jonathan Rosenbaum 76b73352dc Adds VOLUNTEER_DISCOUNT. 2017-08-02 06:18:46 +00:00
Jonathan Rosenbaum cf7bcd5103 Function redeemable added to handle duplicate logic for volunteer hours spinner. 2017-08-02 05:13:43 +00:00
Jonathan Rosenbaum 35c3a69f73 This doesn't allow a value > current_year_volunteer_values on input. 2017-08-01 05:57:34 +00:00
Jonathan Rosenbaum 38286d280a Now uses stand_time_value for "Stand Time" transactions. 2017-08-01 05:34:49 +00:00
Jonathan Rosenbaum 6a89e5d675 Adds a new definition, stand_time_value. 2017-08-01 05:15:20 +00:00
Jonathan Rosenbaum 0ef4138aa4 Changes the logic so that price is read for stand time transactions. 2017-07-31 21:58:58 +00:00
Jonathan Rosenbaum 6b8cdbe0af Adds logic to keyboard input, and makes incremental true. Nice stuff. 2017-07-31 21:27:12 +00:00
Jonathan Rosenbaum 52ba58d805 Changes the model suggestion for volunteer table. 2017-07-31 21:07:51 +00:00
Jonathan Rosenbaum 157cb8474d This gets some of the basic logic working for redeeming volunteer hours. 2017-07-31 21:06:40 +00:00
Jonathan Rosenbaum 7fb848f7d4 The corrects a hereunto unknown very minor bug where data is not being check for value in the deposit calculator function. 2017-07-30 20:02:25 +00:00
Jonathan Rosenbaum a557e2b8f5 This sets up some of the math framework to redeem volunteer hours from amount. 2017-07-29 20:56:45 +00:00
Jonathan Rosenbaum 4feb5022eb Puts all volunteer data into one column called "volunteer". 
* Reflects the changes in json, and adds more definition to the json callback.
 2017-07-29 20:29:18 +00:00
Jonathan Rosenbaum 81e261bc6a Finally have the values rendering properly. 2017-07-28 01:26:54 +00:00
Jonathan Rosenbaum 793fcb42e1 Adds a better regexp thanks to this: 
https://stackoverflow.com/questions/12643009/regular-expression-for-floating-point-numbers
 2017-07-27 19:27:19 +00:00
Jonathan Rosenbaum 21125249ea Makes it even nicer thanks to this good read: 
https://stackoverflow.com/questions/16791940/jquery-ui-spinner-able-to-exceed-max-by-keyboard
 2017-07-27 19:12:19 +00:00
Jonathan Rosenbaum 1202c4909a This cleans up things a bit for spinner. 2017-07-27 18:47:16 +00:00
Jonathan Rosenbaum e663006698 Some experimentation making sure the spinner is working. 
* Need to improve the css
* Need to link everything togther, the fun part!
 2017-07-27 18:01:53 +00:00
Jonathan Rosenbaum 960296c856 Adds the spinner libraries to the code, and adds some css values. 2017-07-27 17:58:53 +00:00
Jonathan Rosenbaum 9f263a68d6 Adds the jQuery UI spinner. 2017-07-27 17:44:35 +00:00
Jonathan Rosenbaum 670d27432b Add MAX_BIKE_EARNED definition. 2017-07-26 19:19:28 +00:00
Jonathan Rosenbaum c6f68ff19b Fixes a presentation bug for paid member in Stand Time. 2017-07-24 05:30:36 +00:00
Jonathan Rosenbaum 7a09ccfead Won't charge stand time if a member. Simplified callback reusing funtion. 2017-07-24 05:02:21 +00:00
Jonathan Rosenbaum f1daa79213 Fixes a bug, and adds membership_benefits function for easier querying. 2017-07-24 04:45:51 +00:00
Jonathan Rosenbaum ff0142aa30 Improves logic for multiple logins and real sign out. 2017-07-24 01:26:50 +00:00
Jonathan Rosenbaum 55620576dd Adds styling for stand time info. 2017-07-24 01:25:57 +00:00
Jonathan Rosenbaum a05575999c Improves the presentation. 2017-07-23 19:57:43 +00:00
Jonathan Rosenbaum eaefff480c Figures out stand time amount with optional grace period. 2017-07-23 19:06:52 +00:00
Jonathan Rosenbaum 7969da316c Adds a missing ; in new definition. 2017-07-23 17:13:48 +00:00
Jonathan Rosenbaum e724e8d9cb The beginnings of Stand Time logic. 2017-07-23 16:57:23 +00:00
Jonathan Rosenbaum 3087e5d21f Adds Stand Time transaction type. 2017-07-23 16:56:12 +00:00
Jonathan Rosenbaum ea3390354c Adds Stand Time definitions. 2017-07-23 16:55:08 +00:00
Jonathan Rosenbaum 40a2a6abab Tests if volunteer_hours exists. 2017-07-20 22:47:37 +00:00
Jonathan Rosenbaum 1805449b50 Changes Personal to Stand Time and many other things: 
* Updates populate
* Makes Stand Time a special transaction_type_id
* Adds new definitions to database_functions
 2017-07-20 22:29:33 +00:00
Jonathan Rosenbaum df15b6933f Adds some improvements: 
* Adds Stand Time Transaction
* Turns off Build Your Own Bike Transaction
* Improves documentation
 2017-07-20 20:29:47 +00:00
Jonathan Rosenbaum c70bac75f7 The corrects a logic error for show_description. 
Now working properly when changed in SQL
 2017-07-20 20:12:36 +00:00
Jonathan Rosenbaum 3c734a60e2 Fixes active flag for transation_type pulldowns. 2017-07-20 19:09:18 +00:00
Jonathan Rosenbaum 79e246246d Now carries over the current year volunteer hours data. 2017-07-18 05:02:44 +00:00
Jonathan Rosenbaum e9da500848 This adds SQL logic for current year volunteer hours and visits. 2017-07-18 04:42:34 +00:00
Jonathan Rosenbaum f782cb90fc This adds the current year to the title for volunteer hours. 2017-07-18 04:40:01 +00:00
Jonathan Rosenbaum 9d07e9a740 Improves the presentation logic. 2017-07-17 20:50:12 +00:00
Jonathan Rosenbaum 787fff74d6 Adds initial Volunteer Hour logic and displays in transactions with title. 2017-07-17 20:38:23 +00:00
Jonathan Rosenbaum 3a0a83cd37 Adds same SQL logic as with paid_membership stats. 2017-07-17 19:16:21 +00:00
Jonathan Rosenbaum be7155de5d Improves the text in the headers. 2017-07-17 19:12:16 +00:00
Jonathan Rosenbaum 8a8009c1f1 Removes an unintentional copy/paste bug. 2017-07-17 19:10:31 +00:00
Jonathan Rosenbaum 7ce6389cd6 Adds another MAX so newest expiration date is reflected. 2017-07-17 19:06:48 +00:00
Jonathan Rosenbaum 8089b40f19 Changed to show only the most recent membership. 2017-07-17 18:45:20 +00:00
Jonathan Rosenbaum afb64b7420 Adds title in span with email, phone, exp. date for membership. 
Ofcourse, ask for ID, too.  May add membership # in the future.
 2017-07-17 09:16:46 +00:00
Jonathan Rosenbaum fb422fcc3b This returns the latest expiration date for membership. 
Future proofing when people have had more than 1 paid membership!
 2017-07-17 07:11:21 +00:00
Jonathan Rosenbaum 69ea453461 Changes the language from members to metrics 
The reason is because Positive Spin policies have changed.  These metrics give you a better idea of who has actually been at the shop based on metrics:

Days and Hours (currently 2 / 8)
 2017-07-17 06:39:15 +00:00
Jonathan Rosenbaum 072313ffc3 Adds constants for membership and volunteers. 2017-07-17 06:03:43 +00:00
Jonathan Rosenbaum b9497ac7c3 Show whether a patron is a paid member or not. 2017-07-17 06:02:32 +00:00
Jonathan Rosenbaum ac54744d20 Removes debugging code. 2017-07-17 06:01:02 +00:00
Jonathan Rosenbaum 60a63e360a This creates divs spans to show data about membership / volunteers. 2017-07-17 05:58:53 +00:00
Jonathan Rosenbaum aee1543b0c Gets rid of debug and unnecessary code. 2017-07-17 00:31:56 +00:00
Jonathan Rosenbaum 1c7d28dd36 Working properly, was borrowing some volunteer metric query before. 2017-07-17 00:28:31 +00:00
Jonathan Rosenbaum 447f7afd61 Now properly finds paid members who are volunteers by metric. 2017-07-17 00:16:44 +00:00
Jonathan Rosenbaum d1c4b91a1f Header description improvement. 2017-07-15 23:41:42 +00:00
Jonathan Rosenbaum f44c6d2bb3 Adds stats for paid members. 2017-07-15 23:38:49 +00:00
Jonathan Rosenbaum 29eefefd39 Nicer than using exclude in .git 2017-07-15 22:51:52 +00:00
Jonathan Rosenbaum 2fd156e66e More for DHHR. 2017-07-15 22:45:23 +00:00
Jonathan Rosenbaum 8f7f737068 Adds a link to dhhr.php 
This file is currently not in devel, but it is being used for Positive Spin.
 2017-07-15 22:43:05 +00:00
Jonathan Rosenbaum 7286fc8c3e Adds a link to dhhr.php 
This file is currently not in devel, but it is being used for Positive Spin.
 2017-07-15 22:39:12 +00:00
Jonathan Rosenbaum 2617c008c0 Improves the header information with days/hours. 2017-07-15 22:30:00 +00:00
Jonathan Rosenbaum 461bddac81 Improves the output. 2017-07-15 22:20:46 +00:00
Jonathan Rosenbaum 163645a329 This corrects the sql membership logic. 2017-07-15 22:08:09 +00:00