Skip to content

feat: add graphs api endpoint #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add graphs api endpoint #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
484 changes: 484 additions & 0 deletions controllers/graphsController.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions controllers/labHours.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { response } from 'express';
import pool from '../config/db.js'

const SAC_CLOSING_HOUR = 2.0
Expand All @@ -11,7 +10,7 @@ export const toggleInOut = async (req, res) => {

try {
const initial = await pool.query(
'SELECT * FROM activeUsers WHERE (enroll_num)=($1)', [enroll_num]
'SELECT * FROM members_info WHERE (enrollment_num)=($1)', [enroll_num]
);

let initStatus = initial.rows[0];
Expand Down Expand Up @@ -161,7 +160,7 @@ export const toggleInOut = async (req, res) => {


const response = await pool.query(
'UPDATE activeUsers SET labdata=($1) WHERE enroll_num = ($2)', [labData, enroll_num]
'UPDATE members_info SET labdata=($1) WHERE enrollment_num = ($2)', [labData, enroll_num]
);


Expand Down
26 changes: 15 additions & 11 deletions controllers/maintenance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import pool from '../config/db.js'


export async function doMaintenance(){
const initial = await pool.query(
'SELECT * FROM activeUsers'
const initial = await pool.query(
'SELECT * FROM members_info'
);




let date = new Date();

const dd = String(date.getDate()).padStart(2, '0');
Expand All @@ -22,30 +21,35 @@ export async function doMaintenance(){

for (let i = 0; i < initial.rows.length; i++) {
const row = initial.rows[i];
const enrollNo = row['enroll_num'];
const enrollNo = row['enrollment_num'];
let labData = row['labdata'];

if (labData == null) {
labData = { 'logs': [], 'isInLab': false, 'labTime': 0, 'dayWise': {} };
}
console.log('pritimg labdaat')
console.log(labData)

if (!(datestr in labData.dayWise)) {
labData.dayWise[datestr] = 0;
}

values.push(enrollNo, JSON.stringify(labData));
const idx = i * 2;
placeholders.push(`($${idx + 1}, $${idx + 2})`);
}

await pool.query('TRUNCATE TABLE activeUsers');
await pool.query(
`UPDATE members_info
SET labdata = $1
WHERE enrollment_num = $2`,
[labData, enrollNo]
);

const query = `INSERT INTO activeUsers (enroll_num, labdata) VALUES ${placeholders.join(', ')}`;
await pool.query(query, values);


}

}


export const setupLogs = async(req, res) =>{
try{

Expand Down
3 changes: 3 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import keyHolderRoutes from './routes/keyHolderRoutes.js';
import labHoursRoutes from './routes/labHoursRoutes.js';
import slackRoutes from './routes/slackRoutes.js';
import eventApiRoutes from './routes/eventApiRoutes.js'
import graphRoutes from './routes/getGraphsRoute.js'

import { startScheduler } from './services/schedulerService.js';

import maintenanceRoute from './routes/maintenanceRoute.js'
Expand Down Expand Up @@ -38,6 +40,7 @@ app.use('/api/message', sendMsgRoute);
app.use('/api/keyHolders', keyHolderRoutes);
app.use('/api/labHours', labHoursRoutes);
app.use('/api/eventApi', eventApiRoutes);
app.use('/api/graphs/', graphRoutes);
startScheduler();

app.use('/api/maintenance', maintenanceRoute)
Expand Down
Loading