Skip to content

Commit

Permalink
Cleaned Code
Browse files Browse the repository at this point in the history
  • Loading branch information
tun82434 committed Apr 16, 2024
1 parent 6bdb397 commit 86dbb2f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 34 deletions.
32 changes: 2 additions & 30 deletions receiptifyv1/public/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -338,14 +338,9 @@ const getPeriod = () => {
};

const getUsersCheckbox = () => {
console.log('getUsersCheckbox');
console.log(document.querySelectorAll('input[name="user-select-checkbox"]:checked'));
var checkboxes = Array.from(document.querySelectorAll('input[name="user-select-checkbox"]:checked'));
console.log(checkboxes);
checkboxes = Array.from(checkboxes);
console.log('checkboxes: ', checkboxes);
var tokens = checkboxes.map(token => token.id);
console.log('tokens: ',tokens);
var users = [];
for (const token of tokens){
const label = document.querySelector(`label[for="${token}"]`);
Expand All @@ -354,10 +349,8 @@ const getUsersCheckbox = () => {
users.push(user);
}
}
console.log('users: ', users);

var users_checkbox = users.map((user, index) =>({ user, token: tokens[index]}));
console.log('getUsersCheckbox Updated List: ', users_checkbox);

// return list of objects. list of user object with name and token.
return users_checkbox;
Expand Down Expand Up @@ -655,18 +648,14 @@ async function fetchUsers(sessionID, type) {
;}


function checkboxUpdate(response, stats, state, users_checkbox, user, isChecked) {
function checkboxUpdate(stats, state, users_checkbox, user, isChecked) {
if (users_checkbox.map(obj => obj.user).includes(null) || users_checkbox.map(obj => obj.token).includes(null)) {
//if (users_checkbox.includes(null)) {
console.log('true null');
users_checkbox.shift();
}
console.log("onclick redisplay");
if (!isChecked){
console.log(`Before: ${users_checkbox}`);
for (let i = 0; i < users_checkbox.length; i++) {
if (users_checkbox[i].user == user){
//if (users_checkbox[i] == user) {
users_checkbox.splice(i, 1);
}
}
Expand All @@ -678,8 +667,6 @@ function checkboxUpdate(response, stats, state, users_checkbox, user, isChecked)
}
if (users_checkbox.length == 0){
users_checkbox.push({user: null, token: null});
//users_checkbox.push(null);
console.log('pushed null: ', users_checkbox);
}
retrieveItems(stats, state);
;}
Expand All @@ -688,7 +675,6 @@ function checkboxUpdate(response, stats, state, users_checkbox, user, isChecked)
const displayReceipt = (response, stats, state, users_checkbox = []) => {
console.log(response, stats, state, users_checkbox);
const scrollPosition = window.scrollY;
//console.log('state & checkbox',state, users_checkbox);
const type = getType();
const font = getFont();
const timeRange = getPeriod();
Expand All @@ -699,14 +685,10 @@ const displayReceipt = (response, stats, state, users_checkbox = []) => {

let params = getHashParams();

//console.log('response: ', response);


const fns = TYPE_FUNCTIONS[type];
const { getResponseItems, itemFns, totalIncrement } = fns;

//console.log(response, stats);
//console.log(getResponseItems, itemFns, totalIncrement);

if (type === 'build-receipt') {
$('#track-edit').show();
Expand Down Expand Up @@ -743,25 +725,19 @@ const displayReceipt = (response, stats, state, users_checkbox = []) => {


const responseItems = getResponseItems(response, stats);
console.log('responses & stats: ', response, stats);
console.log('Response Items DisplayReceipt(): ', responseItems);
const sessionID = params.sessionID;
const name = showSearch && response.label ? response.label : displayName;

let users = [];
(async () => {
try {
users = await fetchUsers(sessionID, 'display_name');
//console.log('Fetched Users', users);
tokens = await fetchUsers(sessionID, 'access_token');
//console.log(`Fetched Tokens: ${tokens}`);

//console.log(tokens);
let total = 0;
const date = TODAY.toLocaleDateString('en-US', DATE_OPTIONS).toUpperCase();
const tracksFormatted = responseItems.map((item, i) => {
total += totalIncrement(item);
//console.log(item);
return {
id: (i + 1 < 10 ? '0' : '') + (i + 1),
url: item.external_urls?.spotify,
Expand All @@ -776,7 +752,6 @@ const displayReceipt = (response, stats, state, users_checkbox = []) => {

if (users_checkbox.length == 0){
console.log("No Previous users_checkbox");
//users_checkbox = [...users];
users_checkbox = users.map((user, index) => ({ user, token: tokens[index]}));

const userCheckbox = document.getElementById('user-checkbox');
Expand All @@ -785,17 +760,14 @@ const displayReceipt = (response, stats, state, users_checkbox = []) => {
userCheckboxTitle.textContent = "Select Users";
userCheckbox.appendChild(userCheckboxTitle);
for (let i = 0; i < users.length; i++) {
//const user = users[i];
//console.log(user);
const checkbox = document.createElement('input');
checkbox.name = 'user-select-checkbox';
checkbox.type = 'checkbox';
checkbox.id = tokens[i];
//checkbox.checked = (users_checkbox.includes(users[i]));
checkbox.checked = users_checkbox.map(obj => obj.user).includes(users[i])
checkbox.onclick = (event) =>{
const isChecked = event.target.checked;
checkboxUpdate(response, stats, state, users_checkbox, users[i], isChecked);
checkboxUpdate(stats, state, users_checkbox, users[i], isChecked);
}

const label = document.createElement('label');
Expand Down
6 changes: 2 additions & 4 deletions receiptifyv1/users.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
display_name, access_token, sessionID


✧ jizzica ✧,BQDOu_IKh4t2B3HudFgMzrUaasUKAjFaePHr-Wg1CSTMXjbqA6gj5mfQcnnC_osq6R7eL2cYdNr3nj48Hky7Q1EPuZiAnzolrFSzjEDMMJoRXv4gRDpaVowDFXzoLuYER681GYPlQp9nNf36ya-zPYuS7uDr_4D7A5HyZZtNzC8vvIyZvcSScCmUv7HXzdWp2s4EXu669JPphLIGqlhIn3wTBypE-hESHEB-3fA,219722,2024-4-16 16:38:58,
Martin Duong,BQCo5AEgHl-JB2eOSxirUd5x9WZgBENY-uj343mK-lCAVstI0bFiXrt6uOVNLf3qOnyEPugAGCadV5qJUlRA2eG_vWvIQjNkFj6UF0ULcpXqOZLJE6uk2IvAaw3VnxE-Px_6e6wZAageZdfEQrj-gNciq5Nta_Gg_UmGo4n_6R5WCcaXtWHw9bDqe3RlPWTQ3-4P6f3LtYBnmtqegHgthqJgnh-xhO0ZWbMc7vY,219722,2024-4-16 16:39:27,
✧ jizzica ✧,BQChAka6mlOzw7MQ9TRXVMCt-TMXc9ygokAOtVMJcLA_Wf7VEX_9NXEJajpVc_Eji3CefksLbHDAnX9fvpLtx7NgcFt7DbS_WwffqnUBOR539JxEVgsqMkmfg97UL_y4zLW4u7GEoHtDymtBxMxnvD7LaaoXL9P63M2UxLRwyxyLH0hI2QIOwyvLEQ0yW53UnQk9XEhdLuyK-tMJtfp3HCldxjtKCSGYFC0PoLY,219722,2024-4-16 17:40:40,
Martin Duong,BQCRfDHLTb6f6sX806cJalJSajBhq6-TB3veC6GRXb3AZ8uHMO6HEOvloqLeLc7xlTx-ZhgOfs22ONj2VWQz5n__xdk7C546UUy7In5MHgg7gYGix7457c0r7gXakCZcaee-brL3qqE3WC1N0U_5KEomJSOBKp39Lr389po2OMTGsnJ8uyOUmnWt2H5EbtvBH9xm1F9T9yOv6n0e9aAfKGfY_-K05xQ4j0-Hvyk,219722,2024-4-16 17:40:56,

0 comments on commit 86dbb2f

Please sign in to comment.