bike/Yellow-Bike-Database-Mirror
1
0
Fork 0
mirror of https://github.com/fspc/Yellow-Bike-Database.git synced 2025-02-22 08:53:23 -05:00
Code Issues Projects Releases Wiki Activity

The beginnings of Stand Time logic.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2017-07-23 16:57:23 +00:00
parent 3087e5d21f
commit e724e8d9cb
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/transaction.js
View File

@ -632,6 +632,7 @@ $(function() {
var description = $("#description");
var quantity = $("#quantity");
var date = $("#date");
var shop_id = $("#shop_id").val();
// require that values be filled in a particular fashion
amount.mask("#0.00", {reverse: true, placeholder: "000.00"});
@ -721,9 +722,18 @@ $(function() {
}); // volunteers post
} // if not no_selection
// Stand Time
if ( $("#trans_type_info").text() === "Stand Time" ) {
$.post("json/transaction.php", { stand_time: 1, contact_id: this.value, shop_id: shop_id }, function (data) {
}); // stand time pos
}
} // if not no_selection
}); // sold_to.change
// note: it is possible to close with all error conditions being satisfied,
// however, it is no biggy.

30
json/transaction.php
View File

@ -6,6 +6,7 @@ mysql_select_db($database_YBDB, $YBDB);
$change_fund = CHANGE_FUND;
$csv_directory = CSV_DIRECTORY;
$stand_time_hourly_rate = STAND_TIME_HOURLY_RATE;
// Is there a current shop?
if(isset($_POST['shop_exist'])) {
@ -90,10 +91,7 @@ $csv_directory = CSV_DIRECTORY;
$sql = mysql_query($query, $YBDB) or die(mysql_error());
$result = mysql_fetch_assoc($sql);
echo json_encode($result);
// SELECT contact_id, full_name, normal_full_name, email, phone, visits, volunteer_hours FROM (SELECT contacts.contact_id, CONCAT(last_name, ', ', first_name, ' ',middle_initial) AS full_name, CONCAT(first_name, ' ', last_name) AS normal_full_name, contacts.email AS email, contacts.phone AS phone, COUNT(shop_hours.contact_id) as visits, ROUND(SUM(HOUR(SUBTIME( TIME(time_out), TIME(time_in))) + MINUTE(SUBTIME( TIME(time_out), TIME(time_in)))/60)) AS volunteer_hours FROM shop_hours LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id WHERE (SUBSTRING_INDEX(time_in, ' ', 1) >= DATE_SUB(CURDATE(),INTERVAL 365 DAY) AND SUBSTRING_INDEX(time_in, ' ', 1) <= DATE_SUB(CURDATE(), INTERVAL 0 DAY)) AND shop_user_roles.volunteer = 1 GROUP BY contact_id) AS members;
echo json_encode($result);
} // Membership Benefits
@ -146,6 +144,30 @@ $csv_directory = CSV_DIRECTORY;
} // Volunteer Benefits
// Stand Time
if (isset($_POST['stand_time'])) {
// use the most recent login status; can do calculations here
// ROUND(SUM(HOUR(SUBTIME( TIME(time_out), TIME(time_in))) + MINUTE(SUBTIME( TIME(time_out), TIME(time_in)))/60))
// SUBSTRING_INDEX(time_in, ' ', 1)
$query = "SELECT time_in, time_out FROM shop_hours WHERE shop_id=" . $_POST['shop_id'] .
" AND shop_user_role='Stand Time'
AND contact_id=" . $_POST['contact_id'] . ";";
$sql = mysql_query($query, $YBDB) or die(mysql_error());
$result = mysql_fetch_assoc($sql);
if($result) {
// Give 15 minutes grace time, and round off to the next hour afterwards
// multiply by stand_time_hourly_rate
echo $result['time_in'] . " " . current_datetime();
}
//echo json_encode($result);
} // Stand Time
// Anonymous transaction - save and communicate back settings
if(isset($_POST['anonymous'])) {