admin/33248
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin:ai-dev
Branches Tags
admin:master
admin:ai-dev
..
compare: admin:master
Branches Tags
admin:ai-dev
admin:master

No commits in common. "ai-dev" and "master" have entirely different histories.
ai-dev ... master

57 changed files with 14 additions and 5779 deletions
Show Stats Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,8 +1,3 @@
node_modules/ node_modules/
*/node_modules/ */node_modules/
*/build/ */build/
**/node_modules/
**/build/
.DS_Store
.env

6
app-shell/src/_schema.json
View File

File diff suppressed because one or more lines are too long

4
backend/src/db/api/classes.js
View File

@ -153,10 +153,6 @@ module.exports = class ClassesDBApi {
const output = classes.get({ plain: true }); const output = classes.get({ plain: true });
output.enrollment_class = await classes.getEnrollment_class({
transaction,
});
output.ai_tutor = await classes.getAi_tutor({ output.ai_tutor = await classes.getAi_tutor({
transaction, transaction,
}); });

596
backend/src/db/api/enrollment.js
View File

@ -1,596 +0,0 @@
const db = require('../models');
const FileDBApi = require('./file');
const crypto = require('crypto');
const Utils = require('../utils');
const Sequelize = db.Sequelize;
const Op = Sequelize.Op;
module.exports = class EnrollmentDBApi {
static async create(data, options) {
const currentUser = (options && options.currentUser) || { id: null };
const transaction = (options && options.transaction) || undefined;
const enrollment = await db.enrollment.create(
{
id: data.id || undefined,
language: data.language || null,
board: data.board || null,
enrollmentmonth: data.enrollmentmonth || null,
studentname: data.studentname || null,
age: data.age || null,
gender: data.gender || null,
nationality: data.nationality || null,
dateofbirth: data.dateofbirth || null,
marksheeturl: data.marksheeturl || null,
parentgovtidurl: data.parentgovtidurl || null,
studentgovtidurl: data.studentgovtidurl || null,
feeamount: data.feeamount || null,
freetrial: data.freetrial || false,
paymentmethod: data.paymentmethod || null,
paymentstatus: data.paymentstatus || null,
transactionid: data.transactionid || null,
importHash: data.importHash || null,
createdById: currentUser.id,
updatedById: currentUser.id,
},
{ transaction },
);
await enrollment.setClass(data.class || null, {
transaction,
});
await enrollment.setParent(data.parent || null, {
transaction,
});
return enrollment;
}
static async bulkImport(data, options) {
const currentUser = (options && options.currentUser) || { id: null };
const transaction = (options && options.transaction) || undefined;
// Prepare data - wrapping individual data transformations in a map() method
const enrollmentData = data.map((item, index) => ({
id: item.id || undefined,
language: item.language || null,
board: item.board || null,
enrollmentmonth: item.enrollmentmonth || null,
studentname: item.studentname || null,
age: item.age || null,
gender: item.gender || null,
nationality: item.nationality || null,
dateofbirth: item.dateofbirth || null,
marksheeturl: item.marksheeturl || null,
parentgovtidurl: item.parentgovtidurl || null,
studentgovtidurl: item.studentgovtidurl || null,
feeamount: item.feeamount || null,
freetrial: item.freetrial || false,
paymentmethod: item.paymentmethod || null,
paymentstatus: item.paymentstatus || null,
transactionid: item.transactionid || null,
importHash: item.importHash || null,
createdById: currentUser.id,
updatedById: currentUser.id,
createdAt: new Date(Date.now() + index * 1000),
}));
// Bulk create items
const enrollment = await db.enrollment.bulkCreate(enrollmentData, {
transaction,
});
// For each item created, replace relation files
return enrollment;
}
static async update(id, data, options) {
const currentUser = (options && options.currentUser) || { id: null };
const transaction = (options && options.transaction) || undefined;
const enrollment = await db.enrollment.findByPk(id, {}, { transaction });
const updatePayload = {};
if (data.language !== undefined) updatePayload.language = data.language;
if (data.board !== undefined) updatePayload.board = data.board;
if (data.enrollmentmonth !== undefined)
updatePayload.enrollmentmonth = data.enrollmentmonth;
if (data.studentname !== undefined)
updatePayload.studentname = data.studentname;
if (data.age !== undefined) updatePayload.age = data.age;
if (data.gender !== undefined) updatePayload.gender = data.gender;
if (data.nationality !== undefined)
updatePayload.nationality = data.nationality;
if (data.dateofbirth !== undefined)
updatePayload.dateofbirth = data.dateofbirth;
if (data.marksheeturl !== undefined)
updatePayload.marksheeturl = data.marksheeturl;
if (data.parentgovtidurl !== undefined)
updatePayload.parentgovtidurl = data.parentgovtidurl;
if (data.studentgovtidurl !== undefined)
updatePayload.studentgovtidurl = data.studentgovtidurl;
if (data.feeamount !== undefined) updatePayload.feeamount = data.feeamount;
if (data.freetrial !== undefined) updatePayload.freetrial = data.freetrial;
if (data.paymentmethod !== undefined)
updatePayload.paymentmethod = data.paymentmethod;
if (data.paymentstatus !== undefined)
updatePayload.paymentstatus = data.paymentstatus;
if (data.transactionid !== undefined)
updatePayload.transactionid = data.transactionid;
updatePayload.updatedById = currentUser.id;
await enrollment.update(updatePayload, { transaction });
if (data.class !== undefined) {
await enrollment.setClass(
data.class,
{ transaction },
);
}
if (data.parent !== undefined) {
await enrollment.setParent(
data.parent,
{ transaction },
);
}
return enrollment;
}
static async deleteByIds(ids, options) {
const currentUser = (options && options.currentUser) || { id: null };
const transaction = (options && options.transaction) || undefined;
const enrollment = await db.enrollment.findAll({
where: {
id: {
[Op.in]: ids,
},
},
transaction,
});
await db.sequelize.transaction(async (transaction) => {
for (const record of enrollment) {
await record.update({ deletedBy: currentUser.id }, { transaction });
}
for (const record of enrollment) {
await record.destroy({ transaction });
}
});
return enrollment;
}
static async remove(id, options) {
const currentUser = (options && options.currentUser) || { id: null };
const transaction = (options && options.transaction) || undefined;
const enrollment = await db.enrollment.findByPk(id, options);
await enrollment.update(
{
deletedBy: currentUser.id,
},
{
transaction,
},
);
await enrollment.destroy({
transaction,
});
return enrollment;
}
static async findBy(where, options) {
const transaction = (options && options.transaction) || undefined;
const enrollment = await db.enrollment.findOne({ where }, { transaction });
if (!enrollment) {
return enrollment;
}
const output = enrollment.get({ plain: true });
output.class = await enrollment.getClass({
transaction,
});
output.parent = await enrollment.getParent({
transaction,
});
return output;
}
static async findAll(filter, options) {
const limit = filter.limit || 0;
let offset = 0;
let where = {};
const currentPage = +filter.page;
offset = currentPage * limit;
const orderBy = null;
const transaction = (options && options.transaction) || undefined;
let include = [
{
model: db.classes,
as: 'class',
where: filter.class
? {
[Op.or]: [
{
id: {
[Op.in]: filter.class
.split('|')
.map((term) => Utils.uuid(term)),
},
},
{
subject: {
[Op.or]: filter.class
.split('|')
.map((term) => ({ [Op.iLike]: `%${term}%` })),
},
},
],
}
: {},
},
{
model: db.parents,
as: 'parent',
where: filter.parent
? {
[Op.or]: [
{
id: {
[Op.in]: filter.parent
.split('|')
.map((term) => Utils.uuid(term)),
},
},
{
first_name: {
[Op.or]: filter.parent
.split('|')
.map((term) => ({ [Op.iLike]: `%${term}%` })),
},
},
],
}
: {},
},
];
if (filter) {
if (filter.id) {
where = {
...where,
['id']: Utils.uuid(filter.id),
};
}
if (filter.language) {
where = {
...where,
[Op.and]: Utils.ilike('enrollment', 'language', filter.language),
};
}
if (filter.board) {
where = {
...where,
[Op.and]: Utils.ilike('enrollment', 'board', filter.board),
};
}
if (filter.enrollmentmonth) {
where = {
...where,
[Op.and]: Utils.ilike(
'enrollment',
'enrollmentmonth',
filter.enrollmentmonth,
),
};
}
if (filter.studentname) {
where = {
...where,
[Op.and]: Utils.ilike(
'enrollment',
'studentname',
filter.studentname,
),
};
}
if (filter.gender) {
where = {
...where,
[Op.and]: Utils.ilike('enrollment', 'gender', filter.gender),
};
}
if (filter.nationality) {
where = {
...where,
[Op.and]: Utils.ilike(
'enrollment',
'nationality',
filter.nationality,
),
};
}
if (filter.marksheeturl) {
where = {
...where,
[Op.and]: Utils.ilike(
'enrollment',
'marksheeturl',
filter.marksheeturl,
),
};
}
if (filter.parentgovtidurl) {
where = {
...where,
[Op.and]: Utils.ilike(
'enrollment',
'parentgovtidurl',
filter.parentgovtidurl,
),
};
}
if (filter.studentgovtidurl) {
where = {
...where,
[Op.and]: Utils.ilike(
'enrollment',
'studentgovtidurl',
filter.studentgovtidurl,
),
};
}
if (filter.paymentmethod) {
where = {
...where,
[Op.and]: Utils.ilike(
'enrollment',
'paymentmethod',
filter.paymentmethod,
),
};
}
if (filter.paymentstatus) {
where = {
...where,
[Op.and]: Utils.ilike(
'enrollment',
'paymentstatus',
filter.paymentstatus,
),
};
}
if (filter.transactionid) {
where = {
...where,
[Op.and]: Utils.ilike(
'enrollment',
'transactionid',
filter.transactionid,
),
};
}
if (filter.ageRange) {
const [start, end] = filter.ageRange;
if (start !== undefined && start !== null && start !== '') {
where = {
...where,
age: {
...where.age,
[Op.gte]: start,
},
};
}
if (end !== undefined && end !== null && end !== '') {
where = {
...where,
age: {
...where.age,
[Op.lte]: end,
},
};
}
}
if (filter.dateofbirthRange) {
const [start, end] = filter.dateofbirthRange;
if (start !== undefined && start !== null && start !== '') {
where = {
...where,
dateofbirth: {
...where.dateofbirth,
[Op.gte]: start,
},
};
}
if (end !== undefined && end !== null && end !== '') {
where = {
...where,
dateofbirth: {
...where.dateofbirth,
[Op.lte]: end,
},
};
}
}
if (filter.feeamountRange) {
const [start, end] = filter.feeamountRange;
if (start !== undefined && start !== null && start !== '') {
where = {
...where,
feeamount: {
...where.feeamount,
[Op.gte]: start,
},
};
}
if (end !== undefined && end !== null && end !== '') {
where = {
...where,
feeamount: {
...where.feeamount,
[Op.lte]: end,
},
};
}
}
if (filter.active !== undefined) {
where = {
...where,
active: filter.active === true || filter.active === 'true',
};
}
if (filter.freetrial) {
where = {
...where,
freetrial: filter.freetrial,
};
}
if (filter.createdAtRange) {
const [start, end] = filter.createdAtRange;
if (start !== undefined && start !== null && start !== '') {
where = {
...where,
['createdAt']: {
...where.createdAt,
[Op.gte]: start,
},
};
}
if (end !== undefined && end !== null && end !== '') {
where = {
...where,
['createdAt']: {
...where.createdAt,
[Op.lte]: end,
},
};
}
}
}
const queryOptions = {
where,
include,
distinct: true,
order:
filter.field && filter.sort
? [[filter.field, filter.sort]]
: [['createdAt', 'desc']],
transaction: options?.transaction,
logging: console.log,
};
if (!options?.countOnly) {
queryOptions.limit = limit ? Number(limit) : undefined;
queryOptions.offset = offset ? Number(offset) : undefined;
}
try {
const { rows, count } = await db.enrollment.findAndCountAll(queryOptions);
return {
rows: options?.countOnly ? [] : rows,
count: count,
};
} catch (error) {
console.error('Error executing query:', error);
throw error;
}
}
static async findAllAutocomplete(query, limit, offset) {
let where = {};
if (query) {
where = {
[Op.or]: [
{ ['id']: Utils.uuid(query) },
Utils.ilike('enrollment', 'studentname', query),
],
};
}
const records = await db.enrollment.findAll({
attributes: ['id', 'studentname'],
where,
limit: limit ? Number(limit) : undefined,
offset: offset ? Number(offset) : undefined,
orderBy: [['studentname', 'ASC']],
});
return records.map((record) => ({
id: record.id,
label: record.studentname,
}));
}
};

4
backend/src/db/api/parents.js
View File

@ -145,10 +145,6 @@ module.exports = class ParentsDBApi {
transaction, transaction,
}); });
output.enrollment_parent = await parents.getEnrollment_parent({
transaction,
});
output.children = await parents.getChildren({ output.children = await parents.getChildren({
transaction, transaction,
}); });

72
backend/src/db/migrations/1754636315840.js
View File

@ -1,72 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.createTable(
'enrollment',
{
id: {
type: Sequelize.DataTypes.UUID,
defaultValue: Sequelize.DataTypes.UUIDV4,
primaryKey: true,
},
createdById: {
type: Sequelize.DataTypes.UUID,
references: {
key: 'id',
model: 'users',
},
},
updatedById: {
type: Sequelize.DataTypes.UUID,
references: {
key: 'id',
model: 'users',
},
},
createdAt: { type: Sequelize.DataTypes.DATE },
updatedAt: { type: Sequelize.DataTypes.DATE },
deletedAt: { type: Sequelize.DataTypes.DATE },
importHash: {
type: Sequelize.DataTypes.STRING(255),
allowNull: true,
unique: true,
},
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.dropTable('enrollment', { transaction });
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

54
backend/src/db/migrations/1754636343963.js
View File

@ -1,54 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'classId',
{
type: Sequelize.DataTypes.UUID,
references: {
model: 'classes',
key: 'id',
},
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'classId', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

54
backend/src/db/migrations/1754636367157.js
View File

@ -1,54 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'parentId',
{
type: Sequelize.DataTypes.UUID,
references: {
model: 'parents',
key: 'id',
},
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'parentId', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636391981.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'language',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'language', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

47
backend/src/db/migrations/1754636417758.js
View File

@ -1,47 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'board',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'board', { transaction });
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636444343.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'enrollmentmonth',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'enrollmentmonth', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636479419.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'studentname',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'studentname', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

47
backend/src/db/migrations/1754636510354.js
View File

@ -1,47 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'age',
{
type: Sequelize.DataTypes.INTEGER,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'age', { transaction });
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636544515.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'gender',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'gender', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636607371.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'nationality',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'nationality', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636637272.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'dateofbirth',
{
type: Sequelize.DataTypes.DATEONLY,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'dateofbirth', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636663438.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'marksheeturl',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'marksheeturl', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636688009.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'parentgovtidurl',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'parentgovtidurl', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636712387.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'studentgovtidurl',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'studentgovtidurl', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636735623.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'feeamount',
{
type: Sequelize.DataTypes.INTEGER,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'feeamount', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

52
backend/src/db/migrations/1754636758062.js
View File

@ -1,52 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'freetrial',
{
type: Sequelize.DataTypes.BOOLEAN,
defaultValue: false,
allowNull: false,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'freetrial', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636779970.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'paymentmethod',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'paymentmethod', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636803744.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'paymentstatus',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'paymentstatus', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

49
backend/src/db/migrations/1754636828945.js
View File

@ -1,49 +0,0 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'enrollment',
'transactionid',
{
type: Sequelize.DataTypes.TEXT,
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('enrollment', 'transactionid', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

8
backend/src/db/models/classes.js
View File

@ -60,14 +60,6 @@ module.exports = function (sequelize, DataTypes) {
/// loop through entities and it's fields, and if ref === current e[name] and create relation has many on parent entity /// loop through entities and it's fields, and if ref === current e[name] and create relation has many on parent entity
db.classes.hasMany(db.enrollment, {
as: 'enrollment_class',
foreignKey: {
name: 'classId',
},
constraints: false,
});
//end loop //end loop
db.classes.belongsTo(db.ai_tutors, { db.classes.belongsTo(db.ai_tutors, {

134
backend/src/db/models/enrollment.js
View File

@ -1,134 +0,0 @@
const config = require('../../config');
const providers = config.providers;
const crypto = require('crypto');
const bcrypt = require('bcrypt');
const moment = require('moment');
module.exports = function (sequelize, DataTypes) {
const enrollment = sequelize.define(
'enrollment',
{
id: {
type: DataTypes.UUID,
defaultValue: DataTypes.UUIDV4,
primaryKey: true,
},
language: {
type: DataTypes.TEXT,
},
board: {
type: DataTypes.TEXT,
},
enrollmentmonth: {
type: DataTypes.TEXT,
},
studentname: {
type: DataTypes.TEXT,
},
age: {
type: DataTypes.INTEGER,
},
gender: {
type: DataTypes.TEXT,
},
nationality: {
type: DataTypes.TEXT,
},
dateofbirth: {
type: DataTypes.DATEONLY,
get: function () {
return this.getDataValue('dateofbirth')
? moment.utc(this.getDataValue('dateofbirth')).format('YYYY-MM-DD')
: null;
},
},
marksheeturl: {
type: DataTypes.TEXT,
},
parentgovtidurl: {
type: DataTypes.TEXT,
},
studentgovtidurl: {
type: DataTypes.TEXT,
},
feeamount: {
type: DataTypes.INTEGER,
},
freetrial: {
type: DataTypes.BOOLEAN,
allowNull: false,
defaultValue: false,
},
paymentmethod: {
type: DataTypes.TEXT,
},
paymentstatus: {
type: DataTypes.TEXT,
},
transactionid: {
type: DataTypes.TEXT,
},
importHash: {
type: DataTypes.STRING(255),
allowNull: true,
unique: true,
},
},
{
timestamps: true,
paranoid: true,
freezeTableName: true,
},
);
enrollment.associate = (db) => {
/// loop through entities and it's fields, and if ref === current e[name] and create relation has many on parent entity
//end loop
db.enrollment.belongsTo(db.classes, {
as: 'class',
foreignKey: {
name: 'classId',
},
constraints: false,
});
db.enrollment.belongsTo(db.parents, {
as: 'parent',
foreignKey: {
name: 'parentId',
},
constraints: false,
});
db.enrollment.belongsTo(db.users, {
as: 'createdBy',
});
db.enrollment.belongsTo(db.users, {
as: 'updatedBy',
});
};
return enrollment;
};

8
backend/src/db/models/parents.js
View File

@ -68,14 +68,6 @@ module.exports = function (sequelize, DataTypes) {
constraints: false, constraints: false,
}); });
db.parents.hasMany(db.enrollment, {
as: 'enrollment_parent',
foreignKey: {
name: 'parentId',
},
constraints: false,
});
//end loop //end loop
db.parents.belongsTo(db.users, { db.parents.belongsTo(db.users, {

26
backend/src/db/seeders/20200430130760-user-roles.js
View File

@ -92,7 +92,6 @@ module.exports = {
'students', 'students',
'roles', 'roles',
'permissions', 'permissions',
'enrollment',
, ,
]; ];
await queryInterface.bulkInsert( await queryInterface.bulkInsert(
@ -726,31 +725,6 @@ primary key ("roles_permissionsId", "permissionId")
permissionId: getId('DELETE_PERMISSIONS'), permissionId: getId('DELETE_PERMISSIONS'),
}, },
{
createdAt,
updatedAt,
roles_permissionsId: getId('Administrator'),
permissionId: getId('CREATE_ENROLLMENT'),
},
{
createdAt,
updatedAt,
roles_permissionsId: getId('Administrator'),
permissionId: getId('READ_ENROLLMENT'),
},
{
createdAt,
updatedAt,
roles_permissionsId: getId('Administrator'),
permissionId: getId('UPDATE_ENROLLMENT'),
},
{
createdAt,
updatedAt,
roles_permissionsId: getId('Administrator'),
permissionId: getId('DELETE_ENROLLMENT'),
},
{ {
createdAt, createdAt,
updatedAt, updatedAt,

206
backend/src/db/seeders/20231127130745-sample-data.js
View File

@ -11,8 +11,6 @@ const Parents = db.parents;
const Students = db.students; const Students = db.students;
const Enrollment = db.enrollment;
const AiTutorsData = [ const AiTutorsData = [
{ {
subject: 'Mathematics', subject: 'Mathematics',
@ -155,9 +153,9 @@ const StudentsData = [
grade: '3', grade: '3',
preferred_language: 'Spanish', preferred_language: 'Mandarin',
educational_board: 'ICSE', educational_board: 'CBSE',
// type code here for "relation_one" field // type code here for "relation_one" field
}, },
@ -171,7 +169,7 @@ const StudentsData = [
preferred_language: 'Spanish', preferred_language: 'Spanish',
educational_board: 'ICSE', educational_board: 'StateBoard',
// type code here for "relation_one" field // type code here for "relation_one" field
}, },
@ -183,130 +181,14 @@ const StudentsData = [
grade: '7', grade: '7',
preferred_language: 'German', preferred_language: 'Mandarin',
educational_board: 'ICSE', educational_board: 'StateBoard',
// type code here for "relation_one" field // type code here for "relation_one" field
}, },
]; ];
const EnrollmentData = [
{
// type code here for "relation_one" field
// type code here for "relation_one" field
language: 'Murray Gell-Mann',
board: 'Jonas Salk',
enrollmentmonth: 'John Bardeen',
studentname: 'Anton van Leeuwenhoek',
age: 7,
gender: 'Nicolaus Copernicus',
nationality: 'Hans Bethe',
dateofbirth: new Date(Date.now()),
marksheeturl: 'Anton van Leeuwenhoek',
parentgovtidurl: 'Louis Pasteur',
studentgovtidurl: 'Sheldon Glashow',
feeamount: 5,
freetrial: true,
paymentmethod: 'Isaac Newton',
paymentstatus: 'Konrad Lorenz',
transactionid: 'Jean Baptiste Lamarck',
},
{
// type code here for "relation_one" field
// type code here for "relation_one" field
language: 'Heike Kamerlingh Onnes',
board: 'Francis Crick',
enrollmentmonth: 'Leonard Euler',
studentname: 'Hans Bethe',
age: 4,
gender: 'Leonard Euler',
nationality: 'Karl Landsteiner',
dateofbirth: new Date(Date.now()),
marksheeturl: 'Sheldon Glashow',
parentgovtidurl: 'John von Neumann',
studentgovtidurl: 'John Dalton',
feeamount: 3,
freetrial: false,
paymentmethod: 'Jonas Salk',
paymentstatus: 'Max Planck',
transactionid: 'Frederick Sanger',
},
{
// type code here for "relation_one" field
// type code here for "relation_one" field
language: 'Nicolaus Copernicus',
board: 'Charles Darwin',
enrollmentmonth: 'Marie Curie',
studentname: 'Hans Bethe',
age: 8,
gender: 'Hans Selye',
nationality: 'Nicolaus Copernicus',
dateofbirth: new Date(Date.now()),
marksheeturl: 'Claude Bernard',
parentgovtidurl: 'Johannes Kepler',
studentgovtidurl: 'Edwin Hubble',
feeamount: 8,
freetrial: false,
paymentmethod: 'Joseph J. Thomson',
paymentstatus: 'Gregor Mendel',
transactionid: 'William Harvey',
},
];
// Similar logic for "relation_many" // Similar logic for "relation_many"
// Similar logic for "relation_many" // Similar logic for "relation_many"
@ -420,76 +302,6 @@ async function associateStudentWithParent() {
} }
} }
async function associateEnrollmentWithClass() {
const relatedClass0 = await Classes.findOne({
offset: Math.floor(Math.random() * (await Classes.count())),
});
const Enrollment0 = await Enrollment.findOne({
order: [['id', 'ASC']],
offset: 0,
});
if (Enrollment0?.setClass) {
await Enrollment0.setClass(relatedClass0);
}
const relatedClass1 = await Classes.findOne({
offset: Math.floor(Math.random() * (await Classes.count())),
});
const Enrollment1 = await Enrollment.findOne({
order: [['id', 'ASC']],
offset: 1,
});
if (Enrollment1?.setClass) {
await Enrollment1.setClass(relatedClass1);
}
const relatedClass2 = await Classes.findOne({
offset: Math.floor(Math.random() * (await Classes.count())),
});
const Enrollment2 = await Enrollment.findOne({
order: [['id', 'ASC']],
offset: 2,
});
if (Enrollment2?.setClass) {
await Enrollment2.setClass(relatedClass2);
}
}
async function associateEnrollmentWithParent() {
const relatedParent0 = await Parents.findOne({
offset: Math.floor(Math.random() * (await Parents.count())),
});
const Enrollment0 = await Enrollment.findOne({
order: [['id', 'ASC']],
offset: 0,
});
if (Enrollment0?.setParent) {
await Enrollment0.setParent(relatedParent0);
}
const relatedParent1 = await Parents.findOne({
offset: Math.floor(Math.random() * (await Parents.count())),
});
const Enrollment1 = await Enrollment.findOne({
order: [['id', 'ASC']],
offset: 1,
});
if (Enrollment1?.setParent) {
await Enrollment1.setParent(relatedParent1);
}
const relatedParent2 = await Parents.findOne({
offset: Math.floor(Math.random() * (await Parents.count())),
});
const Enrollment2 = await Enrollment.findOne({
order: [['id', 'ASC']],
offset: 2,
});
if (Enrollment2?.setParent) {
await Enrollment2.setParent(relatedParent2);
}
}
module.exports = { module.exports = {
up: async (queryInterface, Sequelize) => { up: async (queryInterface, Sequelize) => {
await AiTutors.bulkCreate(AiTutorsData); await AiTutors.bulkCreate(AiTutorsData);
@ -502,8 +314,6 @@ module.exports = {
await Students.bulkCreate(StudentsData); await Students.bulkCreate(StudentsData);
await Enrollment.bulkCreate(EnrollmentData);
await Promise.all([ await Promise.all([
// Similar logic for "relation_many" // Similar logic for "relation_many"
@ -518,10 +328,6 @@ module.exports = {
// Similar logic for "relation_many" // Similar logic for "relation_many"
await associateStudentWithParent(), await associateStudentWithParent(),
await associateEnrollmentWithClass(),
await associateEnrollmentWithParent(),
]); ]);
}, },
@ -535,7 +341,5 @@ module.exports = {
await queryInterface.bulkDelete('parents', null, {}); await queryInterface.bulkDelete('parents', null, {});
await queryInterface.bulkDelete('students', null, {}); await queryInterface.bulkDelete('students', null, {});
await queryInterface.bulkDelete('enrollment', null, {});
}, },
}; };

87
backend/src/db/seeders/20250808065835.js
View File

@ -1,87 +0,0 @@
const { v4: uuid } = require('uuid');
const db = require('../models');
const Sequelize = require('sequelize');
const config = require('../../config');
module.exports = {
/**
* @param{import("sequelize").QueryInterface} queryInterface
* @return {Promise<void>}
*/
async up(queryInterface) {
const createdAt = new Date();
const updatedAt = new Date();
/** @type {Map<string, string>} */
const idMap = new Map();
/**
* @param {string} key
* @return {string}
*/
function getId(key) {
if (idMap.has(key)) {
return idMap.get(key);
}
const id = uuid();
idMap.set(key, id);
return id;
}
/**
* @param {string} name
*/
function createPermissions(name) {
return [
{
id: getId(`CREATE_${name.toUpperCase()}`),
createdAt,
updatedAt,
name: `CREATE_${name.toUpperCase()}`,
},
{
id: getId(`READ_${name.toUpperCase()}`),
createdAt,
updatedAt,
name: `READ_${name.toUpperCase()}`,
},
{
id: getId(`UPDATE_${name.toUpperCase()}`),
createdAt,
updatedAt,
name: `UPDATE_${name.toUpperCase()}`,
},
{
id: getId(`DELETE_${name.toUpperCase()}`),
createdAt,
updatedAt,
name: `DELETE_${name.toUpperCase()}`,
},
];
}
const entities = ['enrollment'];
const createdPermissions = entities.flatMap(createPermissions);
// Add permissions to database
await queryInterface.bulkInsert('permissions', createdPermissions);
// Get permissions ids
const permissionsIds = createdPermissions.map((p) => p.id);
// Get admin role
const adminRole = await db.roles.findOne({
where: { name: config.roles.admin },
});
if (adminRole) {
// Add permissions to admin role if it exists
await adminRole.addPermissions(permissionsIds);
}
},
down: async (queryInterface, Sequelize) => {
await queryInterface.bulkDelete(
'permissions',
entities.flatMap(createPermissions),
);
},
};

8
backend/src/index.js
View File

@ -35,8 +35,6 @@ const rolesRoutes = require('./routes/roles');
const permissionsRoutes = require('./routes/permissions'); const permissionsRoutes = require('./routes/permissions');
const enrollmentRoutes = require('./routes/enrollment');
const getBaseUrl = (url) => { const getBaseUrl = (url) => {
if (!url) return ''; if (!url) return '';
return url.endsWith('/api') ? url.slice(0, -4) : url; return url.endsWith('/api') ? url.slice(0, -4) : url;
@ -150,12 +148,6 @@ app.use(
permissionsRoutes, permissionsRoutes,
); );
app.use(
'/api/enrollment',
passport.authenticate('jwt', { session: false }),
enrollmentRoutes,
);
app.use( app.use(
'/api/openai', '/api/openai',
passport.authenticate('jwt', { session: false }), passport.authenticate('jwt', { session: false }),

496
backend/src/routes/enrollment.js
View File

@ -1,496 +0,0 @@
const express = require('express');
const EnrollmentService = require('../services/enrollment');
const EnrollmentDBApi = require('../db/api/enrollment');
const wrapAsync = require('../helpers').wrapAsync;
const router = express.Router();
const { parse } = require('json2csv');
const { checkCrudPermissions } = require('../middlewares/check-permissions');
router.use(checkCrudPermissions('enrollment'));
/**
* @swagger
* components:
* schemas:
* Enrollment:
* type: object
* properties:
* language:
* type: string
* default: language
* board:
* type: string
* default: board
* enrollmentmonth:
* type: string
* default: enrollmentmonth
* studentname:
* type: string
* default: studentname
* gender:
* type: string
* default: gender
* nationality:
* type: string
* default: nationality
* marksheeturl:
* type: string
* default: marksheeturl
* parentgovtidurl:
* type: string
* default: parentgovtidurl
* studentgovtidurl:
* type: string
* default: studentgovtidurl
* paymentmethod:
* type: string
* default: paymentmethod
* paymentstatus:
* type: string
* default: paymentstatus
* transactionid:
* type: string
* default: transactionid
* age:
* type: integer
* format: int64
* feeamount:
* type: integer
* format: int64
*/
/**
* @swagger
* tags:
* name: Enrollment
* description: The Enrollment managing API
*/
/**
* @swagger
* /api/enrollment:
* post:
* security:
* - bearerAuth: []
* tags: [Enrollment]
* summary: Add new item
* description: Add new item
* requestBody:
* required: true
* content:
* application/json:
* schema:
* properties:
* data:
* description: Data of the updated item
* type: object
* $ref: "#/components/schemas/Enrollment"
* responses:
* 200:
* description: The item was successfully added
* content:
* application/json:
* schema:
* $ref: "#/components/schemas/Enrollment"
* 401:
* $ref: "#/components/responses/UnauthorizedError"
* 405:
* description: Invalid input data
* 500:
* description: Some server error
*/
router.post(
'/',
wrapAsync(async (req, res) => {
const referer =
req.headers.referer ||
`${req.protocol}://${req.hostname}${req.originalUrl}`;
const link = new URL(referer);
await EnrollmentService.create(
req.body.data,
req.currentUser,
true,
link.host,
);
const payload = true;
res.status(200).send(payload);
}),
);
/**
* @swagger
* /api/budgets/bulk-import:
* post:
* security:
* - bearerAuth: []
* tags: [Enrollment]
* summary: Bulk import items
* description: Bulk import items
* requestBody:
* required: true
* content:
* application/json:
* schema:
* properties:
* data:
* description: Data of the updated items
* type: array
* items:
* $ref: "#/components/schemas/Enrollment"
* responses:
* 200:
* description: The items were successfully imported
* content:
* application/json:
* schema:
* $ref: "#/components/schemas/Enrollment"
* 401:
* $ref: "#/components/responses/UnauthorizedError"
* 405:
* description: Invalid input data
* 500:
* description: Some server error
*
*/
router.post(
'/bulk-import',
wrapAsync(async (req, res) => {
const referer =
req.headers.referer ||
`${req.protocol}://${req.hostname}${req.originalUrl}`;
const link = new URL(referer);
await EnrollmentService.bulkImport(req, res, true, link.host);
const payload = true;
res.status(200).send(payload);
}),
);
/**
* @swagger
* /api/enrollment/{id}:
* put:
* security:
* - bearerAuth: []
* tags: [Enrollment]
* summary: Update the data of the selected item
* description: Update the data of the selected item
* parameters:
* - in: path
* name: id
* description: Item ID to update
* required: true
* schema:
* type: string
* requestBody:
* description: Set new item data
* required: true
* content:
* application/json:
* schema:
* properties:
* id:
* description: ID of the updated item
* type: string
* data:
* description: Data of the updated item
* type: object
* $ref: "#/components/schemas/Enrollment"
* required:
* - id
* responses:
* 200:
* description: The item data was successfully updated
* content:
* application/json:
* schema:
* $ref: "#/components/schemas/Enrollment"
* 400:
* description: Invalid ID supplied
* 401:
* $ref: "#/components/responses/UnauthorizedError"
* 404:
* description: Item not found
* 500:
* description: Some server error
*/
router.put(
'/:id',
wrapAsync(async (req, res) => {
await EnrollmentService.update(req.body.data, req.body.id, req.currentUser);
const payload = true;
res.status(200).send(payload);
}),
);
/**
* @swagger
* /api/enrollment/{id}:
* delete:
* security:
* - bearerAuth: []
* tags: [Enrollment]
* summary: Delete the selected item
* description: Delete the selected item
* parameters:
* - in: path
* name: id
* description: Item ID to delete
* required: true
* schema:
* type: string
* responses:
* 200:
* description: The item was successfully deleted
* content:
* application/json:
* schema:
* $ref: "#/components/schemas/Enrollment"
* 400:
* description: Invalid ID supplied
* 401:
* $ref: "#/components/responses/UnauthorizedError"
* 404:
* description: Item not found
* 500:
* description: Some server error
*/
router.delete(
'/:id',
wrapAsync(async (req, res) => {
await EnrollmentService.remove(req.params.id, req.currentUser);
const payload = true;
res.status(200).send(payload);
}),
);
/**
* @swagger
* /api/enrollment/deleteByIds:
* post:
* security:
* - bearerAuth: []
* tags: [Enrollment]
* summary: Delete the selected item list
* description: Delete the selected item list
* requestBody:
* required: true
* content:
* application/json:
* schema:
* properties:
* ids:
* description: IDs of the updated items
* type: array
* responses:
* 200:
* description: The items was successfully deleted
* content:
* application/json:
* schema:
* $ref: "#/components/schemas/Enrollment"
* 401:
* $ref: "#/components/responses/UnauthorizedError"
* 404:
* description: Items not found
* 500:
* description: Some server error
*/
router.post(
'/deleteByIds',
wrapAsync(async (req, res) => {
await EnrollmentService.deleteByIds(req.body.data, req.currentUser);
const payload = true;
res.status(200).send(payload);
}),
);
/**
* @swagger
* /api/enrollment:
* get:
* security:
* - bearerAuth: []
* tags: [Enrollment]
* summary: Get all enrollment
* description: Get all enrollment
* responses:
* 200:
* description: Enrollment list successfully received
* content:
* application/json:
* schema:
* type: array
* items:
* $ref: "#/components/schemas/Enrollment"
* 401:
* $ref: "#/components/responses/UnauthorizedError"
* 404:
* description: Data not found
* 500:
* description: Some server error
*/
router.get(
'/',
wrapAsync(async (req, res) => {
const filetype = req.query.filetype;
const currentUser = req.currentUser;
const payload = await EnrollmentDBApi.findAll(req.query, { currentUser });
if (filetype && filetype === 'csv') {
const fields = [
'id',
'language',
'board',
'enrollmentmonth',
'studentname',
'gender',
'nationality',
'marksheeturl',
'parentgovtidurl',
'studentgovtidurl',
'paymentmethod',
'paymentstatus',
'transactionid',
'age',
'feeamount',
'dateofbirth',
];
const opts = { fields };
try {
const csv = parse(payload.rows, opts);
res.status(200).attachment(csv);
res.send(csv);
} catch (err) {
console.error(err);
}
} else {
res.status(200).send(payload);
}
}),
);
/**
* @swagger
* /api/enrollment/count:
* get:
* security:
* - bearerAuth: []
* tags: [Enrollment]
* summary: Count all enrollment
* description: Count all enrollment
* responses:
* 200:
* description: Enrollment count successfully received
* content:
* application/json:
* schema:
* type: array
* items:
* $ref: "#/components/schemas/Enrollment"
* 401:
* $ref: "#/components/responses/UnauthorizedError"
* 404:
* description: Data not found
* 500:
* description: Some server error
*/
router.get(
'/count',
wrapAsync(async (req, res) => {
const currentUser = req.currentUser;
const payload = await EnrollmentDBApi.findAll(req.query, null, {
countOnly: true,
currentUser,
});
res.status(200).send(payload);
}),
);
/**
* @swagger
* /api/enrollment/autocomplete:
* get:
* security:
* - bearerAuth: []
* tags: [Enrollment]
* summary: Find all enrollment that match search criteria
* description: Find all enrollment that match search criteria
* responses:
* 200:
* description: Enrollment list successfully received
* content:
* application/json:
* schema:
* type: array
* items:
* $ref: "#/components/schemas/Enrollment"
* 401:
* $ref: "#/components/responses/UnauthorizedError"
* 404:
* description: Data not found
* 500:
* description: Some server error
*/
router.get('/autocomplete', async (req, res) => {
const payload = await EnrollmentDBApi.findAllAutocomplete(
req.query.query,
req.query.limit,
req.query.offset,
);
res.status(200).send(payload);
});
/**
* @swagger
* /api/enrollment/{id}:
* get:
* security:
* - bearerAuth: []
* tags: [Enrollment]
* summary: Get selected item
* description: Get selected item
* parameters:
* - in: path
* name: id
* description: ID of item to get
* required: true
* schema:
* type: string
* responses:
* 200:
* description: Selected item successfully received
* content:
* application/json:
* schema:
* $ref: "#/components/schemas/Enrollment"
* 400:
* description: Invalid ID supplied
* 401:
* $ref: "#/components/responses/UnauthorizedError"
* 404:
* description: Item not found
* 500:
* description: Some server error
*/
router.get(
'/:id',
wrapAsync(async (req, res) => {
const payload = await EnrollmentDBApi.findBy({ id: req.params.id });
res.status(200).send(payload);
}),
);
router.use('/', require('../helpers').commonErrorHandler);
module.exports = router;

114
backend/src/services/enrollment.js
View File

@ -1,114 +0,0 @@
const db = require('../db/models');
const EnrollmentDBApi = require('../db/api/enrollment');
const processFile = require('../middlewares/upload');
const ValidationError = require('./notifications/errors/validation');
const csv = require('csv-parser');
const axios = require('axios');
const config = require('../config');
const stream = require('stream');
module.exports = class EnrollmentService {
static async create(data, currentUser) {
const transaction = await db.sequelize.transaction();
try {
await EnrollmentDBApi.create(data, {
currentUser,
transaction,
});
await transaction.commit();
} catch (error) {
await transaction.rollback();
throw error;
}
}
static async bulkImport(req, res, sendInvitationEmails = true, host) {
const transaction = await db.sequelize.transaction();
try {
await processFile(req, res);
const bufferStream = new stream.PassThrough();
const results = [];
await bufferStream.end(Buffer.from(req.file.buffer, 'utf-8')); // convert Buffer to Stream
await new Promise((resolve, reject) => {
bufferStream
.pipe(csv())
.on('data', (data) => results.push(data))
.on('end', async () => {
console.log('CSV results', results);
resolve();
})
.on('error', (error) => reject(error));
});
await EnrollmentDBApi.bulkImport(results, {
transaction,
ignoreDuplicates: true,
validate: true,
currentUser: req.currentUser,
});
await transaction.commit();
} catch (error) {
await transaction.rollback();
throw error;
}
}
static async update(data, id, currentUser) {
const transaction = await db.sequelize.transaction();
try {
let enrollment = await EnrollmentDBApi.findBy({ id }, { transaction });
if (!enrollment) {
throw new ValidationError('enrollmentNotFound');
}
const updatedEnrollment = await EnrollmentDBApi.update(id, data, {
currentUser,
transaction,
});
await transaction.commit();
return updatedEnrollment;
} catch (error) {
await transaction.rollback();
throw error;
}
}
static async deleteByIds(ids, currentUser) {
const transaction = await db.sequelize.transaction();
try {
await EnrollmentDBApi.deleteByIds(ids, {
currentUser,
transaction,
});
await transaction.commit();
} catch (error) {
await transaction.rollback();
throw error;
}
}
static async remove(id, currentUser) {
const transaction = await db.sequelize.transaction();
try {
await EnrollmentDBApi.remove(id, {
currentUser,
transaction,
});
await transaction.commit();
} catch (error) {
await transaction.rollback();
throw error;
}
}
};

28
backend/src/services/search.js
View File

@ -52,37 +52,9 @@ module.exports = class SearchService {
parents: ['first_name', 'last_name', 'email'], parents: ['first_name', 'last_name', 'email'],
students: ['first_name', 'last_name', 'grade'], students: ['first_name', 'last_name', 'grade'],
enrollment: [
'language',
'board',
'enrollmentmonth',
'studentname',
'gender',
'nationality',
'marksheeturl',
'parentgovtidurl',
'studentgovtidurl',
'paymentmethod',
'paymentstatus',
'transactionid',
],
}; };
const columnsInt = { const columnsInt = {
assessments: ['score'], assessments: ['score'],
enrollment: ['age', 'feeamount'],
}; };
let allFoundRecords = []; let allFoundRecords = [];

1
fly.toml
View File

@ -1 +0,0 @@
app = "almamater"

1
frontend/json/runtimeError.json
View File

@ -1 +0,0 @@
{}

286
frontend/src/components/Enrollment/CardEnrollment.tsx
View File

@ -1,286 +0,0 @@
import React from 'react';
import ImageField from '../ImageField';
import ListActionsPopover from '../ListActionsPopover';
import { useAppSelector } from '../../stores/hooks';
import dataFormatter from '../../helpers/dataFormatter';
import { Pagination } from '../Pagination';
import { saveFile } from '../../helpers/fileSaver';
import LoadingSpinner from '../LoadingSpinner';
import Link from 'next/link';
import { hasPermission } from '../../helpers/userPermissions';
type Props = {
enrollment: any[];
loading: boolean;
onDelete: (id: string) => void;
currentPage: number;
numPages: number;
onPageChange: (page: number) => void;
};
const CardEnrollment = ({
enrollment,
loading,
onDelete,
currentPage,
numPages,
onPageChange,
}: Props) => {
const asideScrollbarsStyle = useAppSelector(
(state) => state.style.asideScrollbarsStyle,
);
const bgColor = useAppSelector((state) => state.style.cardsColor);
const darkMode = useAppSelector((state) => state.style.darkMode);
const corners = useAppSelector((state) => state.style.corners);
const focusRing = useAppSelector((state) => state.style.focusRingColor);
const currentUser = useAppSelector((state) => state.auth.currentUser);
const hasUpdatePermission = hasPermission(currentUser, 'UPDATE_ENROLLMENT');
return (
<div className={'p-4'}>
{loading && <LoadingSpinner />}
<ul
role='list'
className='grid grid-cols-1 gap-x-6 gap-y-8 lg:grid-cols-3 2xl:grid-cols-4 xl:gap-x-8'
>
{!loading &&
enrollment.map((item, index) => (
<li
key={item.id}
className={`overflow-hidden ${
corners !== 'rounded-full' ? corners : 'rounded-3xl'
} border ${focusRing} border-gray-200 dark:border-dark-700 ${
darkMode ? 'aside-scrollbars-[slate]' : asideScrollbarsStyle
}`}
>
<div
className={`flex items-center ${bgColor} p-6 gap-x-4 border-b border-gray-900/5 bg-gray-50 dark:bg-dark-800 relative`}
>
<Link
href={`/enrollment/enrollment-view/?id=${item.id}`}
className='text-lg font-bold leading-6 line-clamp-1'
>
{item.studentname}
</Link>
<div className='ml-auto '>
<ListActionsPopover
onDelete={onDelete}
itemId={item.id}
pathEdit={`/enrollment/enrollment-edit/?id=${item.id}`}
pathView={`/enrollment/enrollment-view/?id=${item.id}`}
hasUpdatePermission={hasUpdatePermission}
/>
</div>
</div>
<dl className='divide-y divide-stone-300 dark:divide-dark-700 px-6 py-4 text-sm leading-6 h-64 overflow-y-auto'>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>Class</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{dataFormatter.classesOneListFormatter(item.class)}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Parent
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{dataFormatter.parentsOneListFormatter(item.parent)}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Language
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.language}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>Board</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>{item.board}</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Enrollmentmonth
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.enrollmentmonth}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Studentname
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.studentname}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>Age</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>{item.age}</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Gender
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.gender}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Nationality
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.nationality}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Dateofbirth
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{dataFormatter.dateFormatter(item.dateofbirth)}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Marksheeturl
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.marksheeturl}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Parentgovtidurl
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.parentgovtidurl}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Studentgovtidurl
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.studentgovtidurl}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Feeamount
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.feeamount}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Freetrial
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{dataFormatter.booleanFormatter(item.freetrial)}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Paymentmethod
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.paymentmethod}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Paymentstatus
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.paymentstatus}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Transactionid
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.transactionid}
</div>
</dd>
</div>
</dl>
</li>
))}
{!loading && enrollment.length === 0 && (
<div className='col-span-full flex items-center justify-center h-40'>
<p className=''>No data to display</p>
</div>
)}
</ul>
<div className={'flex items-center justify-center my-6'}>
<Pagination
currentPage={currentPage}
numPages={numPages}
setCurrentPage={onPageChange}
/>
</div>
</div>
);
};
export default CardEnrollment;

194
frontend/src/components/Enrollment/ListEnrollment.tsx
View File

@ -1,194 +0,0 @@
import React from 'react';
import CardBox from '../CardBox';
import ImageField from '../ImageField';
import dataFormatter from '../../helpers/dataFormatter';
import { saveFile } from '../../helpers/fileSaver';
import ListActionsPopover from '../ListActionsPopover';
import { useAppSelector } from '../../stores/hooks';
import { Pagination } from '../Pagination';
import LoadingSpinner from '../LoadingSpinner';
import Link from 'next/link';
import { hasPermission } from '../../helpers/userPermissions';
type Props = {
enrollment: any[];
loading: boolean;
onDelete: (id: string) => void;
currentPage: number;
numPages: number;
onPageChange: (page: number) => void;
};
const ListEnrollment = ({
enrollment,
loading,
onDelete,
currentPage,
numPages,
onPageChange,
}: Props) => {
const currentUser = useAppSelector((state) => state.auth.currentUser);
const hasUpdatePermission = hasPermission(currentUser, 'UPDATE_ENROLLMENT');
const corners = useAppSelector((state) => state.style.corners);
const bgColor = useAppSelector((state) => state.style.cardsColor);
return (
<>
<div className='relative overflow-x-auto p-4 space-y-4'>
{loading && <LoadingSpinner />}
{!loading &&
enrollment.map((item) => (
<div key={item.id}>
<CardBox hasTable isList className={'rounded shadow-none'}>
<div
className={`flex ${bgColor} ${
corners !== 'rounded-full' ? corners : 'rounded-3xl'
} dark:bg-dark-900 border border-stone-300 items-center overflow-hidden`}
>
<Link
href={`/enrollment/enrollment-view/?id=${item.id}`}
className={
'flex-1 px-4 py-6 h-24 flex divide-x-2 divide-stone-300 items-center overflow-hidden`}> dark:divide-dark-700 overflow-x-auto'
}
>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Class</p>
<p className={'line-clamp-2'}>
{dataFormatter.classesOneListFormatter(item.class)}
</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Parent</p>
<p className={'line-clamp-2'}>
{dataFormatter.parentsOneListFormatter(item.parent)}
</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Language</p>
<p className={'line-clamp-2'}>{item.language}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Board</p>
<p className={'line-clamp-2'}>{item.board}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>
Enrollmentmonth
</p>
<p className={'line-clamp-2'}>{item.enrollmentmonth}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Studentname</p>
<p className={'line-clamp-2'}>{item.studentname}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Age</p>
<p className={'line-clamp-2'}>{item.age}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Gender</p>
<p className={'line-clamp-2'}>{item.gender}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Nationality</p>
<p className={'line-clamp-2'}>{item.nationality}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Dateofbirth</p>
<p className={'line-clamp-2'}>
{dataFormatter.dateFormatter(item.dateofbirth)}
</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Marksheeturl</p>
<p className={'line-clamp-2'}>{item.marksheeturl}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>
Parentgovtidurl
</p>
<p className={'line-clamp-2'}>{item.parentgovtidurl}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>
Studentgovtidurl
</p>
<p className={'line-clamp-2'}>{item.studentgovtidurl}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Feeamount</p>
<p className={'line-clamp-2'}>{item.feeamount}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Freetrial</p>
<p className={'line-clamp-2'}>
{dataFormatter.booleanFormatter(item.freetrial)}
</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>
Paymentmethod
</p>
<p className={'line-clamp-2'}>{item.paymentmethod}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>
Paymentstatus
</p>
<p className={'line-clamp-2'}>{item.paymentstatus}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>
Transactionid
</p>
<p className={'line-clamp-2'}>{item.transactionid}</p>
</div>
</Link>
<ListActionsPopover
onDelete={onDelete}
itemId={item.id}
pathEdit={`/enrollment/enrollment-edit/?id=${item.id}`}
pathView={`/enrollment/enrollment-view/?id=${item.id}`}
hasUpdatePermission={hasUpdatePermission}
/>
</div>
</CardBox>
</div>
))}
{!loading && enrollment.length === 0 && (
<div className='col-span-full flex items-center justify-center h-40'>
<p className=''>No data to display</p>
</div>
)}
</div>
<div className={'flex items-center justify-center my-6'}>
<Pagination
currentPage={currentPage}
numPages={numPages}
setCurrentPage={onPageChange}
/>
</div>
</>
);
};
export default ListEnrollment;

487
frontend/src/components/Enrollment/TableEnrollment.tsx
View File

@ -1,487 +0,0 @@
import React, { useEffect, useState, useMemo } from 'react';
import { createPortal } from 'react-dom';
import { ToastContainer, toast } from 'react-toastify';
import BaseButton from '../BaseButton';
import CardBoxModal from '../CardBoxModal';
import CardBox from '../CardBox';
import {
fetch,
update,
deleteItem,
setRefetch,
deleteItemsByIds,
} from '../../stores/enrollment/enrollmentSlice';
import { useAppDispatch, useAppSelector } from '../../stores/hooks';
import { useRouter } from 'next/router';
import { Field, Form, Formik } from 'formik';
import { DataGrid, GridColDef } from '@mui/x-data-grid';
import { loadColumns } from './configureEnrollmentCols';
import _ from 'lodash';
import dataFormatter from '../../helpers/dataFormatter';
import { dataGridStyles } from '../../styles';
const perPage = 10;
const TableSampleEnrollment = ({
filterItems,
setFilterItems,
filters,
showGrid,
}) => {
const notify = (type, msg) => toast(msg, { type, position: 'bottom-center' });
const dispatch = useAppDispatch();
const router = useRouter();
const pagesList = [];
const [id, setId] = useState(null);
const [currentPage, setCurrentPage] = useState(0);
const [filterRequest, setFilterRequest] = React.useState('');
const [columns, setColumns] = useState<GridColDef[]>([]);
const [selectedRows, setSelectedRows] = useState([]);
const [sortModel, setSortModel] = useState([
{
field: '',
sort: 'desc',
},
]);
const {
enrollment,
loading,
count,
notify: enrollmentNotify,
refetch,
} = useAppSelector((state) => state.enrollment);
const { currentUser } = useAppSelector((state) => state.auth);
const focusRing = useAppSelector((state) => state.style.focusRingColor);
const bgColor = useAppSelector((state) => state.style.bgLayoutColor);
const corners = useAppSelector((state) => state.style.corners);
const numPages =
Math.floor(count / perPage) === 0 ? 1 : Math.ceil(count / perPage);
for (let i = 0; i < numPages; i++) {
pagesList.push(i);
}
const loadData = async (page = currentPage, request = filterRequest) => {
if (page !== currentPage) setCurrentPage(page);
if (request !== filterRequest) setFilterRequest(request);
const { sort, field } = sortModel[0];
const query = `?page=${page}&limit=${perPage}${request}&sort=${sort}&field=${field}`;
dispatch(fetch({ limit: perPage, page, query }));
};
useEffect(() => {
if (enrollmentNotify.showNotification) {
notify(
enrollmentNotify.typeNotification,
enrollmentNotify.textNotification,
);
}
}, [enrollmentNotify.showNotification]);
useEffect(() => {
if (!currentUser) return;
loadData();
}, [sortModel, currentUser]);
useEffect(() => {
if (refetch) {
loadData(0);
dispatch(setRefetch(false));
}
}, [refetch, dispatch]);
const [isModalInfoActive, setIsModalInfoActive] = useState(false);
const [isModalTrashActive, setIsModalTrashActive] = useState(false);
const handleModalAction = () => {
setIsModalInfoActive(false);
setIsModalTrashActive(false);
};
const handleDeleteModalAction = (id: string) => {
setId(id);
setIsModalTrashActive(true);
};
const handleDeleteAction = async () => {
if (id) {
await dispatch(deleteItem(id));
await loadData(0);
setIsModalTrashActive(false);
}
};
const generateFilterRequests = useMemo(() => {
let request = '&';
filterItems.forEach((item) => {
const isRangeFilter = filters.find(
(filter) =>
filter.title === item.fields.selectedField &&
(filter.number || filter.date),
);
if (isRangeFilter) {
const from = item.fields.filterValueFrom;
const to = item.fields.filterValueTo;
if (from) {
request += `${item.fields.selectedField}Range=${from}&`;
}
if (to) {
request += `${item.fields.selectedField}Range=${to}&`;
}
} else {
const value = item.fields.filterValue;
if (value) {
request += `${item.fields.selectedField}=${value}&`;
}
}
});
return request;
}, [filterItems, filters]);
const deleteFilter = (value) => {
const newItems = filterItems.filter((item) => item.id !== value);
if (newItems.length) {
setFilterItems(newItems);
} else {
loadData(0, '');
setFilterItems(newItems);
}
};
const handleSubmit = () => {
loadData(0, generateFilterRequests);
};
const handleChange = (id) => (e) => {
const value = e.target.value;
const name = e.target.name;
setFilterItems(
filterItems.map((item) => {
if (item.id !== id) return item;
if (name === 'selectedField') return { id, fields: { [name]: value } };
return { id, fields: { ...item.fields, [name]: value } };
}),
);
};
const handleReset = () => {
setFilterItems([]);
loadData(0, '');
};
const onPageChange = (page: number) => {
loadData(page);
setCurrentPage(page);
};
useEffect(() => {
if (!currentUser) return;
loadColumns(handleDeleteModalAction, `enrollment`, currentUser).then(
(newCols) => setColumns(newCols),
);
}, [currentUser]);
const handleTableSubmit = async (id: string, data) => {
if (!_.isEmpty(data)) {
await dispatch(update({ id, data }))
.unwrap()
.then((res) => res)
.catch((err) => {
throw new Error(err);
});
}
};
const onDeleteRows = async (selectedRows) => {
await dispatch(deleteItemsByIds(selectedRows));
await loadData(0);
};
const controlClasses =
'w-full py-2 px-2 my-2 rounded dark:placeholder-gray-400 ' +
` ${bgColor} ${focusRing} ${corners} ` +
'dark:bg-slate-800 border';
const dataGrid = (
<div className='relative overflow-x-auto'>
<DataGrid
autoHeight
rowHeight={64}
sx={dataGridStyles}
className={'datagrid--table'}
getRowClassName={() => `datagrid--row`}
rows={enrollment ?? []}
columns={columns}
initialState={{
pagination: {
paginationModel: {
pageSize: 10,
},
},
}}
disableRowSelectionOnClick
onProcessRowUpdateError={(params) => {
console.log('Error', params);
}}
processRowUpdate={async (newRow, oldRow) => {
const data = dataFormatter.dataGridEditFormatter(newRow);
try {
await handleTableSubmit(newRow.id, data);
return newRow;
} catch {
return oldRow;
}
}}
sortingMode={'server'}
checkboxSelection
onRowSelectionModelChange={(ids) => {
setSelectedRows(ids);
}}
onSortModelChange={(params) => {
params.length
? setSortModel(params)
: setSortModel([{ field: '', sort: 'desc' }]);
}}
rowCount={count}
pageSizeOptions={[10]}
paginationMode={'server'}
loading={loading}
onPaginationModelChange={(params) => {
onPageChange(params.page);
}}
/>
</div>
);
return (
<>
{filterItems && Array.isArray(filterItems) && filterItems.length ? (
<CardBox>
<Formik
initialValues={{
checkboxes: ['lorem'],
switches: ['lorem'],
radio: 'lorem',
}}
onSubmit={() => null}
>
<Form>
<>
{filterItems &&
filterItems.map((filterItem) => {
return (
<div key={filterItem.id} className='flex mb-4'>
<div className='flex flex-col w-full mr-3'>
<div className=' text-gray-500 font-bold'>
Filter
</div>
<Field
className={controlClasses}
name='selectedField'
id='selectedField'
component='select'
value={filterItem?.fields?.selectedField || ''}
onChange={handleChange(filterItem.id)}
>
{filters.map((selectOption) => (
<option
key={selectOption.title}
value={`${selectOption.title}`}
>
{selectOption.label}
</option>
))}
</Field>
</div>
{filters.find(
(filter) =>
filter.title === filterItem?.fields?.selectedField,
)?.type === 'enum' ? (
<div className='flex flex-col w-full mr-3'>
<div className='text-gray-500 font-bold'>Value</div>
<Field
className={controlClasses}
name='filterValue'
id='filterValue'
component='select'
value={filterItem?.fields?.filterValue || ''}
onChange={handleChange(filterItem.id)}
>
<option value=''>Select Value</option>
{filters
.find(
(filter) =>
filter.title ===
filterItem?.fields?.selectedField,
)
?.options?.map((option) => (
<option key={option} value={option}>
{option}
</option>
))}
</Field>
</div>
) : filters.find(
(filter) =>
filter.title ===
filterItem?.fields?.selectedField,
)?.number ? (
<div className='flex flex-row w-full mr-3'>
<div className='flex flex-col w-full mr-3'>
<div className=' text-gray-500 font-bold'>
From
</div>
<Field
className={controlClasses}
name='filterValueFrom'
placeholder='From'
id='filterValueFrom'
value={
filterItem?.fields?.filterValueFrom || ''
}
onChange={handleChange(filterItem.id)}
/>
</div>
<div className='flex flex-col w-full'>
<div className=' text-gray-500 font-bold'>
To
</div>
<Field
className={controlClasses}
name='filterValueTo'
placeholder='to'
id='filterValueTo'
value={filterItem?.fields?.filterValueTo || ''}
onChange={handleChange(filterItem.id)}
/>
</div>
</div>
) : filters.find(
(filter) =>
filter.title ===
filterItem?.fields?.selectedField,
)?.date ? (
<div className='flex flex-row w-full mr-3'>
<div className='flex flex-col w-full mr-3'>
<div className=' text-gray-500 font-bold'>
From
</div>
<Field
className={controlClasses}
name='filterValueFrom'
placeholder='From'
id='filterValueFrom'
type='datetime-local'
value={
filterItem?.fields?.filterValueFrom || ''
}
onChange={handleChange(filterItem.id)}
/>
</div>
<div className='flex flex-col w-full'>
<div className=' text-gray-500 font-bold'>
To
</div>
<Field
className={controlClasses}
name='filterValueTo'
placeholder='to'
id='filterValueTo'
type='datetime-local'
value={filterItem?.fields?.filterValueTo || ''}
onChange={handleChange(filterItem.id)}
/>
</div>
</div>
) : (
<div className='flex flex-col w-full mr-3'>
<div className=' text-gray-500 font-bold'>
Contains
</div>
<Field
className={controlClasses}
name='filterValue'
placeholder='Contained'
id='filterValue'
value={filterItem?.fields?.filterValue || ''}
onChange={handleChange(filterItem.id)}
/>
</div>
)}
<div className='flex flex-col'>
<div className=' text-gray-500 font-bold'>
Action
</div>
<BaseButton
className='my-2'
type='reset'
color='danger'
label='Delete'
onClick={() => {
deleteFilter(filterItem.id);
}}
/>
</div>
</div>
);
})}
<div className='flex'>
<BaseButton
className='my-2 mr-3'
type='submit'
color='info'
label='Apply'
onClick={handleSubmit}
/>
<BaseButton
className='my-2'
type='reset'
color='info'
outline
label='Cancel'
onClick={handleReset}
/>
</div>
</>
</Form>
</Formik>
</CardBox>
) : null}
<CardBoxModal
title='Please confirm'
buttonColor='info'
buttonLabel={loading ? 'Deleting...' : 'Confirm'}
isActive={isModalTrashActive}
onConfirm={handleDeleteAction}
onCancel={handleModalAction}
>
<p>Are you sure you want to delete this item?</p>
</CardBoxModal>
{dataGrid}
{selectedRows.length > 0 &&
createPortal(
<BaseButton
className='me-4'
color='danger'
label={`Delete ${selectedRows.length === 1 ? 'Row' : 'Rows'}`}
onClick={() => onDeleteRows(selectedRows)}
/>,
document.getElementById('delete-rows-button'),
)}
<ToastContainer />
</>
);
};
export default TableSampleEnrollment;

304
frontend/src/components/Enrollment/configureEnrollmentCols.tsx
View File

@ -1,304 +0,0 @@
import React from 'react';
import BaseIcon from '../BaseIcon';
import { mdiEye, mdiTrashCan, mdiPencilOutline } from '@mdi/js';
import axios from 'axios';
import {
GridActionsCellItem,
GridRowParams,
GridValueGetterParams,
} from '@mui/x-data-grid';
import ImageField from '../ImageField';
import { saveFile } from '../../helpers/fileSaver';
import dataFormatter from '../../helpers/dataFormatter';
import DataGridMultiSelect from '../DataGridMultiSelect';
import ListActionsPopover from '../ListActionsPopover';
import { hasPermission } from '../../helpers/userPermissions';
type Params = (id: string) => void;
export const loadColumns = async (
onDelete: Params,
entityName: string,
user,
) => {
async function callOptionsApi(entityName: string) {
if (!hasPermission(user, 'READ_' + entityName.toUpperCase())) return [];
try {
const data = await axios(`/${entityName}/autocomplete?limit=100`);
return data.data;
} catch (error) {
console.log(error);
return [];
}
}
const hasUpdatePermission = hasPermission(user, 'UPDATE_ENROLLMENT');
return [
{
field: 'class',
headerName: 'Class',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
sortable: false,
type: 'singleSelect',
getOptionValue: (value: any) => value?.id,
getOptionLabel: (value: any) => value?.label,
valueOptions: await callOptionsApi('classes'),
valueGetter: (params: GridValueGetterParams) =>
params?.value?.id ?? params?.value,
},
{
field: 'parent',
headerName: 'Parent',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
sortable: false,
type: 'singleSelect',
getOptionValue: (value: any) => value?.id,
getOptionLabel: (value: any) => value?.label,
valueOptions: await callOptionsApi('parents'),
valueGetter: (params: GridValueGetterParams) =>
params?.value?.id ?? params?.value,
},
{
field: 'language',
headerName: 'Language',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'board',
headerName: 'Board',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'enrollmentmonth',
headerName: 'Enrollmentmonth',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'studentname',
headerName: 'Studentname',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'age',
headerName: 'Age',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
type: 'number',
},
{
field: 'gender',
headerName: 'Gender',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'nationality',
headerName: 'Nationality',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'dateofbirth',
headerName: 'Dateofbirth',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
type: 'date',
valueGetter: (params: GridValueGetterParams) =>
new Date(params.row.dateofbirth),
},
{
field: 'marksheeturl',
headerName: 'Marksheeturl',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'parentgovtidurl',
headerName: 'Parentgovtidurl',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'studentgovtidurl',
headerName: 'Studentgovtidurl',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'feeamount',
headerName: 'Feeamount',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
type: 'number',
},
{
field: 'freetrial',
headerName: 'Freetrial',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
type: 'boolean',
},
{
field: 'paymentmethod',
headerName: 'Paymentmethod',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'paymentstatus',
headerName: 'Paymentstatus',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'transactionid',
headerName: 'Transactionid',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
},
{
field: 'actions',
type: 'actions',
minWidth: 30,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
getActions: (params: GridRowParams) => {
return [
<div key={params?.row?.id}>
<ListActionsPopover
onDelete={onDelete}
itemId={params?.row?.id}
pathEdit={`/enrollment/enrollment-edit/?id=${params?.row?.id}`}
pathView={`/enrollment/enrollment-view/?id=${params?.row?.id}`}
hasUpdatePermission={hasUpdatePermission}
/>
</div>,
];
},
},
];
};

4
frontend/src/components/WebPageComponents/Footer.tsx
View File

@ -17,9 +17,9 @@ export default function WebSiteFooter({ projectName }: WebSiteFooterProps) {
const borders = useAppSelector((state) => state.style.borders); const borders = useAppSelector((state) => state.style.borders);
const websiteHeder = useAppSelector((state) => state.style.websiteHeder); const websiteHeder = useAppSelector((state) => state.style.websiteHeder);
const style = FooterStyle.WITH_PROJECT_NAME; const style = FooterStyle.WITH_PAGES;
const design = FooterDesigns.DESIGN_DIVERSITY; const design = FooterDesigns.DEFAULT_DESIGN;
return ( return (
<div <div

2
frontend/src/components/WebPageComponents/Header.tsx
View File

@ -19,7 +19,7 @@ export default function WebSiteHeader({ projectName }: WebSiteHeaderProps) {
const style = HeaderStyle.PAGES_RIGHT; const style = HeaderStyle.PAGES_RIGHT;
const design = HeaderDesigns.DESIGN_DIVERSITY; const design = HeaderDesigns.DEFAULT_DESIGN;
return ( return (
<header id='websiteHeader' className='overflow-hidden'> <header id='websiteHeader' className='overflow-hidden'>
<div <div

19
frontend/src/helpers/dataFormatter.js
View File

@ -58,25 +58,6 @@ export default {
return { label: val.subject, id: val.id }; return { label: val.subject, id: val.id };
}, },
classesManyListFormatter(val) {
if (!val || !val.length) return [];
return val.map((item) => item.subject);
},
classesOneListFormatter(val) {
if (!val) return '';
return val.subject;
},
classesManyListFormatterEdit(val) {
if (!val || !val.length) return [];
return val.map((item) => {
return { id: item.id, label: item.subject };
});
},
classesOneListFormatterEdit(val) {
if (!val) return '';
return { label: val.subject, id: val.id };
},
parentsManyListFormatter(val) { parentsManyListFormatter(val) {
if (!val || !val.length) return []; if (!val || !val.length) return [];
return val.map((item) => item.first_name); return val.map((item) => item.first_name);

8
frontend/src/menuAside.ts
View File

@ -87,14 +87,6 @@ const menuAside: MenuAsideItem[] = [
icon: icon.mdiShieldAccountOutline ?? icon.mdiTable, icon: icon.mdiShieldAccountOutline ?? icon.mdiTable,
permissions: 'READ_PERMISSIONS', permissions: 'READ_PERMISSIONS',
}, },
{
href: '/enrollment/enrollment-list',
label: 'Enrollment',
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
icon: icon.mdiTable ?? icon.mdiTable,
permissions: 'READ_ENROLLMENT',
},
{ {
href: '/profile', href: '/profile',
label: 'Profile', label: 'Profile',

113
frontend/src/pages/classes/classes-view.tsx
View File

@ -160,119 +160,6 @@ const ClassesView = () => {
</CardBox> </CardBox>
</> </>
<>
<p className={'block font-bold mb-2'}>Enrollment Class</p>
<CardBox
className='mb-6 border border-gray-300 rounded overflow-hidden'
hasTable
>
<div className='overflow-x-auto'>
<table>
<thead>
<tr>
<th>Language</th>
<th>Board</th>
<th>Enrollmentmonth</th>
<th>Studentname</th>
<th>Age</th>
<th>Gender</th>
<th>Nationality</th>
<th>Dateofbirth</th>
<th>Marksheeturl</th>
<th>Parentgovtidurl</th>
<th>Studentgovtidurl</th>
<th>Feeamount</th>
<th>Freetrial</th>
<th>Paymentmethod</th>
<th>Paymentstatus</th>
<th>Transactionid</th>
</tr>
</thead>
<tbody>
{classes.enrollment_class &&
Array.isArray(classes.enrollment_class) &&
classes.enrollment_class.map((item: any) => (
<tr
key={item.id}
onClick={() =>
router.push(
`/enrollment/enrollment-view/?id=${item.id}`,
)
}
>
<td data-label='language'>{item.language}</td>
<td data-label='board'>{item.board}</td>
<td data-label='enrollmentmonth'>
{item.enrollmentmonth}
</td>
<td data-label='studentname'>{item.studentname}</td>
<td data-label='age'>{item.age}</td>
<td data-label='gender'>{item.gender}</td>
<td data-label='nationality'>{item.nationality}</td>
<td data-label='dateofbirth'>
{dataFormatter.dateFormatter(item.dateofbirth)}
</td>
<td data-label='marksheeturl'>{item.marksheeturl}</td>
<td data-label='parentgovtidurl'>
{item.parentgovtidurl}
</td>
<td data-label='studentgovtidurl'>
{item.studentgovtidurl}
</td>
<td data-label='feeamount'>{item.feeamount}</td>
<td data-label='freetrial'>
{dataFormatter.booleanFormatter(item.freetrial)}
</td>
<td data-label='paymentmethod'>
{item.paymentmethod}
</td>
<td data-label='paymentstatus'>
{item.paymentstatus}
</td>
<td data-label='transactionid'>
{item.transactionid}
</td>
</tr>
))}
</tbody>
</table>
</div>
{!classes?.enrollment_class?.length && (
<div className={'text-center py-4'}>No data</div>
)}
</CardBox>
</>
<BaseDivider /> <BaseDivider />
<BaseButton <BaseButton

35
frontend/src/pages/dashboard.tsx
View File

@ -36,7 +36,6 @@ const Dashboard = () => {
const [students, setStudents] = React.useState(loadingMessage); const [students, setStudents] = React.useState(loadingMessage);
const [roles, setRoles] = React.useState(loadingMessage); const [roles, setRoles] = React.useState(loadingMessage);
const [permissions, setPermissions] = React.useState(loadingMessage); const [permissions, setPermissions] = React.useState(loadingMessage);
const [enrollment, setEnrollment] = React.useState(loadingMessage);
const [widgetsRole, setWidgetsRole] = React.useState({ const [widgetsRole, setWidgetsRole] = React.useState({
role: { value: '', label: '' }, role: { value: '', label: '' },
@ -56,7 +55,6 @@ const Dashboard = () => {
'students', 'students',
'roles', 'roles',
'permissions', 'permissions',
'enrollment',
]; ];
const fns = [ const fns = [
setUsers, setUsers,
@ -67,7 +65,6 @@ const Dashboard = () => {
setStudents, setStudents,
setRoles, setRoles,
setPermissions, setPermissions,
setEnrollment,
]; ];
const requests = entities.map((entity, index) => { const requests = entities.map((entity, index) => {
@ -461,38 +458,6 @@ const Dashboard = () => {
</div> </div>
</Link> </Link>
)} )}
{hasPermission(currentUser, 'READ_ENROLLMENT') && (
<Link href={'/enrollment/enrollment-list'}>
<div
className={`${
corners !== 'rounded-full' ? corners : 'rounded-3xl'
} dark:bg-dark-900 ${cardsStyle} dark:border-dark-700 p-6`}
>
<div className='flex justify-between align-center'>
<div>
<div className='text-lg leading-tight text-gray-500 dark:text-gray-400'>
Enrollment
</div>
<div className='text-3xl leading-tight font-semibold'>
{enrollment}
</div>
</div>
<div>
<BaseIcon
className={`${iconsColor}`}
w='w-16'
h='h-16'
size={48}
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
path={icon.mdiTable || icon.mdiTable}
/>
</div>
</div>
</div>
</Link>
)}
</div> </div>
</SectionMain> </SectionMain>
</> </>

260
frontend/src/pages/enrollment/[enrollmentId].tsx
View File

@ -1,260 +0,0 @@
import { mdiChartTimelineVariant, mdiUpload } from '@mdi/js';
import Head from 'next/head';
import React, { ReactElement, useEffect, useState } from 'react';
import DatePicker from 'react-datepicker';
import 'react-datepicker/dist/react-datepicker.css';
import dayjs from 'dayjs';
import CardBox from '../../components/CardBox';
import LayoutAuthenticated from '../../layouts/Authenticated';
import SectionMain from '../../components/SectionMain';
import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton';
import { getPageTitle } from '../../config';
import { Field, Form, Formik } from 'formik';
import FormField from '../../components/FormField';
import BaseDivider from '../../components/BaseDivider';
import BaseButtons from '../../components/BaseButtons';
import BaseButton from '../../components/BaseButton';
import FormCheckRadio from '../../components/FormCheckRadio';
import FormCheckRadioGroup from '../../components/FormCheckRadioGroup';
import FormFilePicker from '../../components/FormFilePicker';
import FormImagePicker from '../../components/FormImagePicker';
import { SelectField } from '../../components/SelectField';
import { SelectFieldMany } from '../../components/SelectFieldMany';
import { SwitchField } from '../../components/SwitchField';
import { RichTextField } from '../../components/RichTextField';
import { update, fetch } from '../../stores/enrollment/enrollmentSlice';
import { useAppDispatch, useAppSelector } from '../../stores/hooks';
import { useRouter } from 'next/router';
import { saveFile } from '../../helpers/fileSaver';
import dataFormatter from '../../helpers/dataFormatter';
import ImageField from '../../components/ImageField';
const EditEnrollment = () => {
const router = useRouter();
const dispatch = useAppDispatch();
const initVals = {
class: null,
parent: null,
language: '',
board: '',
enrollmentmonth: '',
studentname: '',
age: '',
gender: '',
nationality: '',
dateofbirth: new Date(),
marksheeturl: '',
parentgovtidurl: '',
studentgovtidurl: '',
feeamount: '',
freetrial: false,
paymentmethod: '',
paymentstatus: '',
transactionid: '',
};
const [initialValues, setInitialValues] = useState(initVals);
const { enrollment } = useAppSelector((state) => state.enrollment);
const { enrollmentId } = router.query;
useEffect(() => {
dispatch(fetch({ id: enrollmentId }));
}, [enrollmentId]);
useEffect(() => {
if (typeof enrollment === 'object') {
setInitialValues(enrollment);
}
}, [enrollment]);
useEffect(() => {
if (typeof enrollment === 'object') {
const newInitialVal = { ...initVals };
Object.keys(initVals).forEach(
(el) => (newInitialVal[el] = enrollment[el]),
);
setInitialValues(newInitialVal);
}
}, [enrollment]);
const handleSubmit = async (data) => {
await dispatch(update({ id: enrollmentId, data }));
await router.push('/enrollment/enrollment-list');
};
return (
<>
<Head>
<title>{getPageTitle('Edit enrollment')}</title>
</Head>
<SectionMain>
<SectionTitleLineWithButton
icon={mdiChartTimelineVariant}
title={'Edit enrollment'}
main
>
{''}
</SectionTitleLineWithButton>
<CardBox>
<Formik
enableReinitialize
initialValues={initialValues}
onSubmit={(values) => handleSubmit(values)}
>
<Form>
<FormField label='Class' labelFor='class'>
<Field
name='class'
id='class'
component={SelectField}
options={initialValues.class}
itemRef={'classes'}
showField={'subject'}
></Field>
</FormField>
<FormField label='Parent' labelFor='parent'>
<Field
name='parent'
id='parent'
component={SelectField}
options={initialValues.parent}
itemRef={'parents'}
showField={'first_name'}
></Field>
</FormField>
<FormField label='Language'>
<Field name='language' placeholder='Language' />
</FormField>
<FormField label='Board'>
<Field name='board' placeholder='Board' />
</FormField>
<FormField label='Enrollmentmonth'>
<Field name='enrollmentmonth' placeholder='Enrollmentmonth' />
</FormField>
<FormField label='Studentname'>
<Field name='studentname' placeholder='Studentname' />
</FormField>
<FormField label='Age'>
<Field type='number' name='age' placeholder='Age' />
</FormField>
<FormField label='Gender'>
<Field name='gender' placeholder='Gender' />
</FormField>
<FormField label='Nationality'>
<Field name='nationality' placeholder='Nationality' />
</FormField>
<FormField label='Dateofbirth'>
<DatePicker
dateFormat='yyyy-MM-dd'
selected={
initialValues.dateofbirth
? new Date(
dayjs(initialValues.dateofbirth).format(
'YYYY-MM-DD hh:mm',
),
)
: null
}
onChange={(date) =>
setInitialValues({ ...initialValues, dateofbirth: date })
}
/>
</FormField>
<FormField label='Marksheeturl'>
<Field name='marksheeturl' placeholder='Marksheeturl' />
</FormField>
<FormField label='Parentgovtidurl'>
<Field name='parentgovtidurl' placeholder='Parentgovtidurl' />
</FormField>
<FormField label='Studentgovtidurl'>
<Field name='studentgovtidurl' placeholder='Studentgovtidurl' />
</FormField>
<FormField label='Feeamount'>
<Field type='number' name='feeamount' placeholder='Feeamount' />
</FormField>
<FormField label='Freetrial' labelFor='freetrial'>
<Field
name='freetrial'
id='freetrial'
component={SwitchField}
></Field>
</FormField>
<FormField label='Paymentmethod'>
<Field name='paymentmethod' placeholder='Paymentmethod' />
</FormField>
<FormField label='Paymentstatus'>
<Field name='paymentstatus' placeholder='Paymentstatus' />
</FormField>
<FormField label='Transactionid'>
<Field name='transactionid' placeholder='Transactionid' />
</FormField>
<BaseDivider />
<BaseButtons>
<BaseButton type='submit' color='info' label='Submit' />
<BaseButton type='reset' color='info' outline label='Reset' />
<BaseButton
type='reset'
color='danger'
outline
label='Cancel'
onClick={() => router.push('/enrollment/enrollment-list')}
/>
</BaseButtons>
</Form>
</Formik>
</CardBox>
</SectionMain>
</>
);
};
EditEnrollment.getLayout = function getLayout(page: ReactElement) {
return (
<LayoutAuthenticated permission={'UPDATE_ENROLLMENT'}>
{page}
</LayoutAuthenticated>
);
};
export default EditEnrollment;

258
frontend/src/pages/enrollment/enrollment-edit.tsx
View File

@ -1,258 +0,0 @@
import { mdiChartTimelineVariant, mdiUpload } from '@mdi/js';
import Head from 'next/head';
import React, { ReactElement, useEffect, useState } from 'react';
import DatePicker from 'react-datepicker';
import 'react-datepicker/dist/react-datepicker.css';
import dayjs from 'dayjs';
import CardBox from '../../components/CardBox';
import LayoutAuthenticated from '../../layouts/Authenticated';
import SectionMain from '../../components/SectionMain';
import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton';
import { getPageTitle } from '../../config';
import { Field, Form, Formik } from 'formik';
import FormField from '../../components/FormField';
import BaseDivider from '../../components/BaseDivider';
import BaseButtons from '../../components/BaseButtons';
import BaseButton from '../../components/BaseButton';
import FormCheckRadio from '../../components/FormCheckRadio';
import FormCheckRadioGroup from '../../components/FormCheckRadioGroup';
import FormFilePicker from '../../components/FormFilePicker';
import FormImagePicker from '../../components/FormImagePicker';
import { SelectField } from '../../components/SelectField';
import { SelectFieldMany } from '../../components/SelectFieldMany';
import { SwitchField } from '../../components/SwitchField';
import { RichTextField } from '../../components/RichTextField';
import { update, fetch } from '../../stores/enrollment/enrollmentSlice';
import { useAppDispatch, useAppSelector } from '../../stores/hooks';
import { useRouter } from 'next/router';
import { saveFile } from '../../helpers/fileSaver';
import dataFormatter from '../../helpers/dataFormatter';
import ImageField from '../../components/ImageField';
const EditEnrollmentPage = () => {
const router = useRouter();
const dispatch = useAppDispatch();
const initVals = {
class: null,
parent: null,
language: '',
board: '',
enrollmentmonth: '',
studentname: '',
age: '',
gender: '',
nationality: '',
dateofbirth: new Date(),
marksheeturl: '',
parentgovtidurl: '',
studentgovtidurl: '',
feeamount: '',
freetrial: false,
paymentmethod: '',
paymentstatus: '',
transactionid: '',
};
const [initialValues, setInitialValues] = useState(initVals);
const { enrollment } = useAppSelector((state) => state.enrollment);
const { id } = router.query;
useEffect(() => {
dispatch(fetch({ id: id }));
}, [id]);
useEffect(() => {
if (typeof enrollment === 'object') {
setInitialValues(enrollment);
}
}, [enrollment]);
useEffect(() => {
if (typeof enrollment === 'object') {
const newInitialVal = { ...initVals };
Object.keys(initVals).forEach(
(el) => (newInitialVal[el] = enrollment[el]),
);
setInitialValues(newInitialVal);
}
}, [enrollment]);
const handleSubmit = async (data) => {
await dispatch(update({ id: id, data }));
await router.push('/enrollment/enrollment-list');
};
return (
<>
<Head>
<title>{getPageTitle('Edit enrollment')}</title>
</Head>
<SectionMain>
<SectionTitleLineWithButton
icon={mdiChartTimelineVariant}
title={'Edit enrollment'}
main
>
{''}
</SectionTitleLineWithButton>
<CardBox>
<Formik
enableReinitialize
initialValues={initialValues}
onSubmit={(values) => handleSubmit(values)}
>
<Form>
<FormField label='Class' labelFor='class'>
<Field
name='class'
id='class'
component={SelectField}
options={initialValues.class}
itemRef={'classes'}
showField={'subject'}
></Field>
</FormField>
<FormField label='Parent' labelFor='parent'>
<Field
name='parent'
id='parent'
component={SelectField}
options={initialValues.parent}
itemRef={'parents'}
showField={'first_name'}
></Field>
</FormField>
<FormField label='Language'>
<Field name='language' placeholder='Language' />
</FormField>
<FormField label='Board'>
<Field name='board' placeholder='Board' />
</FormField>
<FormField label='Enrollmentmonth'>
<Field name='enrollmentmonth' placeholder='Enrollmentmonth' />
</FormField>
<FormField label='Studentname'>
<Field name='studentname' placeholder='Studentname' />
</FormField>
<FormField label='Age'>
<Field type='number' name='age' placeholder='Age' />
</FormField>
<FormField label='Gender'>
<Field name='gender' placeholder='Gender' />
</FormField>
<FormField label='Nationality'>
<Field name='nationality' placeholder='Nationality' />
</FormField>
<FormField label='Dateofbirth'>
<DatePicker
dateFormat='yyyy-MM-dd'
selected={
initialValues.dateofbirth
? new Date(
dayjs(initialValues.dateofbirth).format(
'YYYY-MM-DD hh:mm',
),
)
: null
}
onChange={(date) =>
setInitialValues({ ...initialValues, dateofbirth: date })
}
/>
</FormField>
<FormField label='Marksheeturl'>
<Field name='marksheeturl' placeholder='Marksheeturl' />
</FormField>
<FormField label='Parentgovtidurl'>
<Field name='parentgovtidurl' placeholder='Parentgovtidurl' />
</FormField>
<FormField label='Studentgovtidurl'>
<Field name='studentgovtidurl' placeholder='Studentgovtidurl' />
</FormField>
<FormField label='Feeamount'>
<Field type='number' name='feeamount' placeholder='Feeamount' />
</FormField>
<FormField label='Freetrial' labelFor='freetrial'>
<Field
name='freetrial'
id='freetrial'
component={SwitchField}
></Field>
</FormField>
<FormField label='Paymentmethod'>
<Field name='paymentmethod' placeholder='Paymentmethod' />
</FormField>
<FormField label='Paymentstatus'>
<Field name='paymentstatus' placeholder='Paymentstatus' />
</FormField>
<FormField label='Transactionid'>
<Field name='transactionid' placeholder='Transactionid' />
</FormField>
<BaseDivider />
<BaseButtons>
<BaseButton type='submit' color='info' label='Submit' />
<BaseButton type='reset' color='info' outline label='Reset' />
<BaseButton
type='reset'
color='danger'
outline
label='Cancel'
onClick={() => router.push('/enrollment/enrollment-list')}
/>
</BaseButtons>
</Form>
</Formik>
</CardBox>
</SectionMain>
</>
);
};
EditEnrollmentPage.getLayout = function getLayout(page: ReactElement) {
return (
<LayoutAuthenticated permission={'UPDATE_ENROLLMENT'}>
{page}
</LayoutAuthenticated>
);
};
export default EditEnrollmentPage;

181
frontend/src/pages/enrollment/enrollment-list.tsx
View File

@ -1,181 +0,0 @@
import { mdiChartTimelineVariant } from '@mdi/js';
import Head from 'next/head';
import { uniqueId } from 'lodash';
import React, { ReactElement, useState } from 'react';
import CardBox from '../../components/CardBox';
import LayoutAuthenticated from '../../layouts/Authenticated';
import SectionMain from '../../components/SectionMain';
import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton';
import { getPageTitle } from '../../config';
import TableEnrollment from '../../components/Enrollment/TableEnrollment';
import BaseButton from '../../components/BaseButton';
import axios from 'axios';
import Link from 'next/link';
import { useAppDispatch, useAppSelector } from '../../stores/hooks';
import CardBoxModal from '../../components/CardBoxModal';
import DragDropFilePicker from '../../components/DragDropFilePicker';
import { setRefetch, uploadCsv } from '../../stores/enrollment/enrollmentSlice';
import { hasPermission } from '../../helpers/userPermissions';
const EnrollmentTablesPage = () => {
const [filterItems, setFilterItems] = useState([]);
const [csvFile, setCsvFile] = useState<File | null>(null);
const [isModalActive, setIsModalActive] = useState(false);
const [showTableView, setShowTableView] = useState(false);
const { currentUser } = useAppSelector((state) => state.auth);
const dispatch = useAppDispatch();
const [filters] = useState([
{ label: 'Language', title: 'language' },
{ label: 'Board', title: 'board' },
{ label: 'Enrollmentmonth', title: 'enrollmentmonth' },
{ label: 'Studentname', title: 'studentname' },
{ label: 'Gender', title: 'gender' },
{ label: 'Nationality', title: 'nationality' },
{ label: 'Marksheeturl', title: 'marksheeturl' },
{ label: 'Parentgovtidurl', title: 'parentgovtidurl' },
{ label: 'Studentgovtidurl', title: 'studentgovtidurl' },
{ label: 'Paymentmethod', title: 'paymentmethod' },
{ label: 'Paymentstatus', title: 'paymentstatus' },
{ label: 'Transactionid', title: 'transactionid' },
{ label: 'Age', title: 'age', number: 'true' },
{ label: 'Feeamount', title: 'feeamount', number: 'true' },
{ label: 'Class', title: 'class' },
{ label: 'Parent', title: 'parent' },
]);
const hasCreatePermission =
currentUser && hasPermission(currentUser, 'CREATE_ENROLLMENT');
const addFilter = () => {
const newItem = {
id: uniqueId(),
fields: {
filterValue: '',
filterValueFrom: '',
filterValueTo: '',
selectedField: '',
},
};
newItem.fields.selectedField = filters[0].title;
setFilterItems([...filterItems, newItem]);
};
const getEnrollmentCSV = async () => {
const response = await axios({
url: '/enrollment?filetype=csv',
method: 'GET',
responseType: 'blob',
});
const type = response.headers['content-type'];
const blob = new Blob([response.data], { type: type });
const link = document.createElement('a');
link.href = window.URL.createObjectURL(blob);
link.download = 'enrollmentCSV.csv';
link.click();
};
const onModalConfirm = async () => {
if (!csvFile) return;
await dispatch(uploadCsv(csvFile));
dispatch(setRefetch(true));
setCsvFile(null);
setIsModalActive(false);
};
const onModalCancel = () => {
setCsvFile(null);
setIsModalActive(false);
};
return (
<>
<Head>
<title>{getPageTitle('Enrollment')}</title>
</Head>
<SectionMain>
<SectionTitleLineWithButton
icon={mdiChartTimelineVariant}
title='Enrollment'
main
>
{''}
</SectionTitleLineWithButton>
<CardBox className='mb-6' cardBoxClassName='flex flex-wrap'>
{hasCreatePermission && (
<BaseButton
className={'mr-3'}
href={'/enrollment/enrollment-new'}
color='info'
label='New Item'
/>
)}
<BaseButton
className={'mr-3'}
color='info'
label='Filter'
onClick={addFilter}
/>
<BaseButton
className={'mr-3'}
color='info'
label='Download CSV'
onClick={getEnrollmentCSV}
/>
{hasCreatePermission && (
<BaseButton
color='info'
label='Upload CSV'
onClick={() => setIsModalActive(true)}
/>
)}
<div className='md:inline-flex items-center ms-auto'>
<div id='delete-rows-button'></div>
</div>
</CardBox>
<CardBox className='mb-6' hasTable>
<TableEnrollment
filterItems={filterItems}
setFilterItems={setFilterItems}
filters={filters}
showGrid={false}
/>
</CardBox>
</SectionMain>
<CardBoxModal
title='Upload CSV'
buttonColor='info'
buttonLabel={'Confirm'}
// buttonLabel={false ? 'Deleting...' : 'Confirm'}
isActive={isModalActive}
onConfirm={onModalConfirm}
onCancel={onModalCancel}
>
<DragDropFilePicker
file={csvFile}
setFile={setCsvFile}
formats={'.csv'}
/>
</CardBoxModal>
</>
);
};
EnrollmentTablesPage.getLayout = function getLayout(page: ReactElement) {
return (
<LayoutAuthenticated permission={'READ_ENROLLMENT'}>
{page}
</LayoutAuthenticated>
);
};
export default EnrollmentTablesPage;

221
frontend/src/pages/enrollment/enrollment-new.tsx
View File

@ -1,221 +0,0 @@
import {
mdiAccount,
mdiChartTimelineVariant,
mdiMail,
mdiUpload,
} from '@mdi/js';
import Head from 'next/head';
import React, { ReactElement } from 'react';
import CardBox from '../../components/CardBox';
import LayoutAuthenticated from '../../layouts/Authenticated';
import SectionMain from '../../components/SectionMain';
import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton';
import { getPageTitle } from '../../config';
import { Field, Form, Formik } from 'formik';
import FormField from '../../components/FormField';
import BaseDivider from '../../components/BaseDivider';
import BaseButtons from '../../components/BaseButtons';
import BaseButton from '../../components/BaseButton';
import FormCheckRadio from '../../components/FormCheckRadio';
import FormCheckRadioGroup from '../../components/FormCheckRadioGroup';
import FormFilePicker from '../../components/FormFilePicker';
import FormImagePicker from '../../components/FormImagePicker';
import { SwitchField } from '../../components/SwitchField';
import { SelectField } from '../../components/SelectField';
import { SelectFieldMany } from '../../components/SelectFieldMany';
import { RichTextField } from '../../components/RichTextField';
import { create } from '../../stores/enrollment/enrollmentSlice';
import { useAppDispatch } from '../../stores/hooks';
import { useRouter } from 'next/router';
import moment from 'moment';
const initialValues = {
class: '',
parent: '',
language: '',
board: '',
enrollmentmonth: '',
studentname: '',
age: '',
gender: '',
nationality: '',
dateofbirth: '',
dateDateofbirth: '',
marksheeturl: '',
parentgovtidurl: '',
studentgovtidurl: '',
feeamount: '',
freetrial: false,
paymentmethod: '',
paymentstatus: '',
transactionid: '',
};
const EnrollmentNew = () => {
const router = useRouter();
const dispatch = useAppDispatch();
const handleSubmit = async (data) => {
await dispatch(create(data));
await router.push('/enrollment/enrollment-list');
};
return (
<>
<Head>
<title>{getPageTitle('New Item')}</title>
</Head>
<SectionMain>
<SectionTitleLineWithButton
icon={mdiChartTimelineVariant}
title='New Item'
main
>
{''}
</SectionTitleLineWithButton>
<CardBox>
<Formik
initialValues={initialValues}
onSubmit={(values) => handleSubmit(values)}
>
<Form>
<FormField label='Class' labelFor='class'>
<Field
name='class'
id='class'
component={SelectField}
options={[]}
itemRef={'classes'}
></Field>
</FormField>
<FormField label='Parent' labelFor='parent'>
<Field
name='parent'
id='parent'
component={SelectField}
options={[]}
itemRef={'parents'}
></Field>
</FormField>
<FormField label='Language'>
<Field name='language' placeholder='Language' />
</FormField>
<FormField label='Board'>
<Field name='board' placeholder='Board' />
</FormField>
<FormField label='Enrollmentmonth'>
<Field name='enrollmentmonth' placeholder='Enrollmentmonth' />
</FormField>
<FormField label='Studentname'>
<Field name='studentname' placeholder='Studentname' />
</FormField>
<FormField label='Age'>
<Field type='number' name='age' placeholder='Age' />
</FormField>
<FormField label='Gender'>
<Field name='gender' placeholder='Gender' />
</FormField>
<FormField label='Nationality'>
<Field name='nationality' placeholder='Nationality' />
</FormField>
<FormField label='Dateofbirth'>
<Field
type='date'
name='dateofbirth'
placeholder='Dateofbirth'
/>
</FormField>
<FormField label='Marksheeturl'>
<Field name='marksheeturl' placeholder='Marksheeturl' />
</FormField>
<FormField label='Parentgovtidurl'>
<Field name='parentgovtidurl' placeholder='Parentgovtidurl' />
</FormField>
<FormField label='Studentgovtidurl'>
<Field name='studentgovtidurl' placeholder='Studentgovtidurl' />
</FormField>
<FormField label='Feeamount'>
<Field type='number' name='feeamount' placeholder='Feeamount' />
</FormField>
<FormField label='Freetrial' labelFor='freetrial'>
<Field
name='freetrial'
id='freetrial'
component={SwitchField}
></Field>
</FormField>
<FormField label='Paymentmethod'>
<Field name='paymentmethod' placeholder='Paymentmethod' />
</FormField>
<FormField label='Paymentstatus'>
<Field name='paymentstatus' placeholder='Paymentstatus' />
</FormField>
<FormField label='Transactionid'>
<Field name='transactionid' placeholder='Transactionid' />
</FormField>
<BaseDivider />
<BaseButtons>
<BaseButton type='submit' color='info' label='Submit' />
<BaseButton type='reset' color='info' outline label='Reset' />
<BaseButton
type='reset'
color='danger'
outline
label='Cancel'
onClick={() => router.push('/enrollment/enrollment-list')}
/>
</BaseButtons>
</Form>
</Formik>
</CardBox>
</SectionMain>
</>
);
};
EnrollmentNew.getLayout = function getLayout(page: ReactElement) {
return (
<LayoutAuthenticated permission={'CREATE_ENROLLMENT'}>
{page}
</LayoutAuthenticated>
);
};
export default EnrollmentNew;

180
frontend/src/pages/enrollment/enrollment-table.tsx
View File

@ -1,180 +0,0 @@
import { mdiChartTimelineVariant } from '@mdi/js';
import Head from 'next/head';
import { uniqueId } from 'lodash';
import React, { ReactElement, useState } from 'react';
import CardBox from '../../components/CardBox';
import LayoutAuthenticated from '../../layouts/Authenticated';
import SectionMain from '../../components/SectionMain';
import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton';
import { getPageTitle } from '../../config';
import TableEnrollment from '../../components/Enrollment/TableEnrollment';
import BaseButton from '../../components/BaseButton';
import axios from 'axios';
import Link from 'next/link';
import { useAppDispatch, useAppSelector } from '../../stores/hooks';
import CardBoxModal from '../../components/CardBoxModal';
import DragDropFilePicker from '../../components/DragDropFilePicker';
import { setRefetch, uploadCsv } from '../../stores/enrollment/enrollmentSlice';
import { hasPermission } from '../../helpers/userPermissions';
const EnrollmentTablesPage = () => {
const [filterItems, setFilterItems] = useState([]);
const [csvFile, setCsvFile] = useState<File | null>(null);
const [isModalActive, setIsModalActive] = useState(false);
const [showTableView, setShowTableView] = useState(false);
const { currentUser } = useAppSelector((state) => state.auth);
const dispatch = useAppDispatch();
const [filters] = useState([
{ label: 'Language', title: 'language' },
{ label: 'Board', title: 'board' },
{ label: 'Enrollmentmonth', title: 'enrollmentmonth' },
{ label: 'Studentname', title: 'studentname' },
{ label: 'Gender', title: 'gender' },
{ label: 'Nationality', title: 'nationality' },
{ label: 'Marksheeturl', title: 'marksheeturl' },
{ label: 'Parentgovtidurl', title: 'parentgovtidurl' },
{ label: 'Studentgovtidurl', title: 'studentgovtidurl' },
{ label: 'Paymentmethod', title: 'paymentmethod' },
{ label: 'Paymentstatus', title: 'paymentstatus' },
{ label: 'Transactionid', title: 'transactionid' },
{ label: 'Age', title: 'age', number: 'true' },
{ label: 'Feeamount', title: 'feeamount', number: 'true' },
{ label: 'Class', title: 'class' },
{ label: 'Parent', title: 'parent' },
]);
const hasCreatePermission =
currentUser && hasPermission(currentUser, 'CREATE_ENROLLMENT');
const addFilter = () => {
const newItem = {
id: uniqueId(),
fields: {
filterValue: '',
filterValueFrom: '',
filterValueTo: '',
selectedField: '',
},
};
newItem.fields.selectedField = filters[0].title;
setFilterItems([...filterItems, newItem]);
};
const getEnrollmentCSV = async () => {
const response = await axios({
url: '/enrollment?filetype=csv',
method: 'GET',
responseType: 'blob',
});
const type = response.headers['content-type'];
const blob = new Blob([response.data], { type: type });
const link = document.createElement('a');
link.href = window.URL.createObjectURL(blob);
link.download = 'enrollmentCSV.csv';
link.click();
};
const onModalConfirm = async () => {
if (!csvFile) return;
await dispatch(uploadCsv(csvFile));
dispatch(setRefetch(true));
setCsvFile(null);
setIsModalActive(false);
};
const onModalCancel = () => {
setCsvFile(null);
setIsModalActive(false);
};
return (
<>
<Head>
<title>{getPageTitle('Enrollment')}</title>
</Head>
<SectionMain>
<SectionTitleLineWithButton
icon={mdiChartTimelineVariant}
title='Enrollment'
main
>
{''}
</SectionTitleLineWithButton>
<CardBox className='mb-6' cardBoxClassName='flex flex-wrap'>
{hasCreatePermission && (
<BaseButton
className={'mr-3'}
href={'/enrollment/enrollment-new'}
color='info'
label='New Item'
/>
)}
<BaseButton
className={'mr-3'}
color='info'
label='Filter'
onClick={addFilter}
/>
<BaseButton
className={'mr-3'}
color='info'
label='Download CSV'
onClick={getEnrollmentCSV}
/>
{hasCreatePermission && (
<BaseButton
color='info'
label='Upload CSV'
onClick={() => setIsModalActive(true)}
/>
)}
<div className='md:inline-flex items-center ms-auto'>
<div id='delete-rows-button'></div>
</div>
</CardBox>
<CardBox className='mb-6' hasTable>
<TableEnrollment
filterItems={filterItems}
setFilterItems={setFilterItems}
filters={filters}
showGrid={true}
/>
</CardBox>
</SectionMain>
<CardBoxModal
title='Upload CSV'
buttonColor='info'
buttonLabel={'Confirm'}
// buttonLabel={false ? 'Deleting...' : 'Confirm'}
isActive={isModalActive}
onConfirm={onModalConfirm}
onCancel={onModalCancel}
>
<DragDropFilePicker
file={csvFile}
setFile={setCsvFile}
formats={'.csv'}
/>
</CardBoxModal>
</>
);
};
EnrollmentTablesPage.getLayout = function getLayout(page: ReactElement) {
return (
<LayoutAuthenticated permission={'READ_ENROLLMENT'}>
{page}
</LayoutAuthenticated>
);
};
export default EnrollmentTablesPage;

189
frontend/src/pages/enrollment/enrollment-view.tsx
View File

@ -1,189 +0,0 @@
import React, { ReactElement, useEffect } from 'react';
import Head from 'next/head';
import DatePicker from 'react-datepicker';
import 'react-datepicker/dist/react-datepicker.css';
import dayjs from 'dayjs';
import { useAppDispatch, useAppSelector } from '../../stores/hooks';
import { useRouter } from 'next/router';
import { fetch } from '../../stores/enrollment/enrollmentSlice';
import { saveFile } from '../../helpers/fileSaver';
import dataFormatter from '../../helpers/dataFormatter';
import ImageField from '../../components/ImageField';
import LayoutAuthenticated from '../../layouts/Authenticated';
import { getPageTitle } from '../../config';
import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton';
import SectionMain from '../../components/SectionMain';
import CardBox from '../../components/CardBox';
import BaseButton from '../../components/BaseButton';
import BaseDivider from '../../components/BaseDivider';
import { mdiChartTimelineVariant } from '@mdi/js';
import { SwitchField } from '../../components/SwitchField';
import FormField from '../../components/FormField';
const EnrollmentView = () => {
const router = useRouter();
const dispatch = useAppDispatch();
const { enrollment } = useAppSelector((state) => state.enrollment);
const { id } = router.query;
function removeLastCharacter(str) {
console.log(str, `str`);
return str.slice(0, -1);
}
useEffect(() => {
dispatch(fetch({ id }));
}, [dispatch, id]);
return (
<>
<Head>
<title>{getPageTitle('View enrollment')}</title>
</Head>
<SectionMain>
<SectionTitleLineWithButton
icon={mdiChartTimelineVariant}
title={removeLastCharacter('View enrollment')}
main
>
<BaseButton
color='info'
label='Edit'
href={`/enrollment/enrollment-edit/?id=${id}`}
/>
</SectionTitleLineWithButton>
<CardBox>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Class</p>
<p>{enrollment?.class?.subject ?? 'No data'}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Parent</p>
<p>{enrollment?.parent?.first_name ?? 'No data'}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Language</p>
<p>{enrollment?.language}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Board</p>
<p>{enrollment?.board}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Enrollmentmonth</p>
<p>{enrollment?.enrollmentmonth}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Studentname</p>
<p>{enrollment?.studentname}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Age</p>
<p>{enrollment?.age || 'No data'}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Gender</p>
<p>{enrollment?.gender}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Nationality</p>
<p>{enrollment?.nationality}</p>
</div>
<FormField label='Dateofbirth'>
{enrollment.dateofbirth ? (
<DatePicker
dateFormat='yyyy-MM-dd'
showTimeSelect
selected={
enrollment.dateofbirth
? new Date(
dayjs(enrollment.dateofbirth).format(
'YYYY-MM-DD hh:mm',
),
)
: null
}
disabled
/>
) : (
<p>No Dateofbirth</p>
)}
</FormField>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Marksheeturl</p>
<p>{enrollment?.marksheeturl}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Parentgovtidurl</p>
<p>{enrollment?.parentgovtidurl}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Studentgovtidurl</p>
<p>{enrollment?.studentgovtidurl}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Feeamount</p>
<p>{enrollment?.feeamount || 'No data'}</p>
</div>
<FormField label='Freetrial'>
<SwitchField
field={{ name: 'freetrial', value: enrollment?.freetrial }}
form={{ setFieldValue: () => null }}
disabled
/>
</FormField>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Paymentmethod</p>
<p>{enrollment?.paymentmethod}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Paymentstatus</p>
<p>{enrollment?.paymentstatus}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Transactionid</p>
<p>{enrollment?.transactionid}</p>
</div>
<BaseDivider />
<BaseButton
color='info'
label='Back'
onClick={() => router.push('/enrollment/enrollment-list')}
/>
</CardBox>
</SectionMain>
</>
);
};
EnrollmentView.getLayout = function getLayout(page: ReactElement) {
return (
<LayoutAuthenticated permission={'READ_ENROLLMENT'}>
{page}
</LayoutAuthenticated>
);
};
export default EnrollmentView;

2
frontend/src/pages/index.tsx
View File

@ -129,7 +129,7 @@ export default function WebSite() {
<FeaturesSection <FeaturesSection
projectName={'almamater'} projectName={'almamater'}
image={['AI tutors guiding students']} image={['AI tutors guiding students']}
withBg={0} withBg={1}
features={features_points} features={features_points}
mainText={`Discover the Power of ${projectName}`} mainText={`Discover the Power of ${projectName}`}
subTitle={`Explore the innovative features of ${projectName} that make learning engaging and personalized for every student.`} subTitle={`Explore the innovative features of ${projectName} that make learning engaging and personalized for every student.`}

113
frontend/src/pages/parents/parents-view.tsx
View File

@ -183,119 +183,6 @@ const ParentsView = () => {
</CardBox> </CardBox>
</> </>
<>
<p className={'block font-bold mb-2'}>Enrollment Parent</p>
<CardBox
className='mb-6 border border-gray-300 rounded overflow-hidden'
hasTable
>
<div className='overflow-x-auto'>
<table>
<thead>
<tr>
<th>Language</th>
<th>Board</th>
<th>Enrollmentmonth</th>
<th>Studentname</th>
<th>Age</th>
<th>Gender</th>
<th>Nationality</th>
<th>Dateofbirth</th>
<th>Marksheeturl</th>
<th>Parentgovtidurl</th>
<th>Studentgovtidurl</th>
<th>Feeamount</th>
<th>Freetrial</th>
<th>Paymentmethod</th>
<th>Paymentstatus</th>
<th>Transactionid</th>
</tr>
</thead>
<tbody>
{parents.enrollment_parent &&
Array.isArray(parents.enrollment_parent) &&
parents.enrollment_parent.map((item: any) => (
<tr
key={item.id}
onClick={() =>
router.push(
`/enrollment/enrollment-view/?id=${item.id}`,
)
}
>
<td data-label='language'>{item.language}</td>
<td data-label='board'>{item.board}</td>
<td data-label='enrollmentmonth'>
{item.enrollmentmonth}
</td>
<td data-label='studentname'>{item.studentname}</td>
<td data-label='age'>{item.age}</td>
<td data-label='gender'>{item.gender}</td>
<td data-label='nationality'>{item.nationality}</td>
<td data-label='dateofbirth'>
{dataFormatter.dateFormatter(item.dateofbirth)}
</td>
<td data-label='marksheeturl'>{item.marksheeturl}</td>
<td data-label='parentgovtidurl'>
{item.parentgovtidurl}
</td>
<td data-label='studentgovtidurl'>
{item.studentgovtidurl}
</td>
<td data-label='feeamount'>{item.feeamount}</td>
<td data-label='freetrial'>
{dataFormatter.booleanFormatter(item.freetrial)}
</td>
<td data-label='paymentmethod'>
{item.paymentmethod}
</td>
<td data-label='paymentstatus'>
{item.paymentstatus}
</td>
<td data-label='transactionid'>
{item.transactionid}
</td>
</tr>
))}
</tbody>
</table>
</div>
{!parents?.enrollment_parent?.length && (
<div className={'text-center py-4'}>No data</div>
)}
</CardBox>
</>
<BaseDivider /> <BaseDivider />
<BaseButton <BaseButton

2
frontend/src/pages/web_pages/about.tsx
View File

@ -119,7 +119,7 @@ export default function WebSite() {
<FeaturesSection <FeaturesSection
projectName={'almamater'} projectName={'almamater'}
image={['Innovative AI education features']} image={['Innovative AI education features']}
withBg={1} withBg={0}
features={features_points} features={features_points}
mainText={`Explore ${projectName} Core Features`} mainText={`Explore ${projectName} Core Features`}
subTitle={`Discover the innovative features that make ${projectName} a leader in AI-powered education, providing personalized and engaging learning experiences.`} subTitle={`Discover the innovative features that make ${projectName} a leader in AI-powered education, providing personalized and engaging learning experiences.`}

236
frontend/src/stores/enrollment/enrollmentSlice.ts
View File

@ -1,236 +0,0 @@
import { createSlice, createAsyncThunk, PayloadAction } from '@reduxjs/toolkit';
import axios from 'axios';
import {
fulfilledNotify,
rejectNotify,
resetNotify,
} from '../../helpers/notifyStateHandler';
interface MainState {
enrollment: any;
loading: boolean;
count: number;
refetch: boolean;
rolesWidgets: any[];
notify: {
showNotification: boolean;
textNotification: string;
typeNotification: string;
};
}
const initialState: MainState = {
enrollment: [],
loading: false,
count: 0,
refetch: false,
rolesWidgets: [],
notify: {
showNotification: false,
textNotification: '',
typeNotification: 'warn',
},
};
export const fetch = createAsyncThunk('enrollment/fetch', async (data: any) => {
const { id, query } = data;
const result = await axios.get(`enrollment${query || (id ? `/${id}` : '')}`);
return id
? result.data
: { rows: result.data.rows, count: result.data.count };
});
export const deleteItemsByIds = createAsyncThunk(
'enrollment/deleteByIds',
async (data: any, { rejectWithValue }) => {
try {
await axios.post('enrollment/deleteByIds', { data });
} catch (error) {
if (!error.response) {
throw error;
}
return rejectWithValue(error.response.data);
}
},
);
export const deleteItem = createAsyncThunk(
'enrollment/deleteEnrollment',
async (id: string, { rejectWithValue }) => {
try {
await axios.delete(`enrollment/${id}`);
} catch (error) {
if (!error.response) {
throw error;
}
return rejectWithValue(error.response.data);
}
},
);
export const create = createAsyncThunk(
'enrollment/createEnrollment',
async (data: any, { rejectWithValue }) => {
try {
const result = await axios.post('enrollment', { data });
return result.data;
} catch (error) {
if (!error.response) {
throw error;
}
return rejectWithValue(error.response.data);
}
},
);
export const uploadCsv = createAsyncThunk(
'enrollment/uploadCsv',
async (file: File, { rejectWithValue }) => {
try {
const data = new FormData();
data.append('file', file);
data.append('filename', file.name);
const result = await axios.post('enrollment/bulk-import', data, {
headers: {
'Content-Type': 'multipart/form-data',
},
});
return result.data;
} catch (error) {
if (!error.response) {
throw error;
}
return rejectWithValue(error.response.data);
}
},
);
export const update = createAsyncThunk(
'enrollment/updateEnrollment',
async (payload: any, { rejectWithValue }) => {
try {
const result = await axios.put(`enrollment/${payload.id}`, {
id: payload.id,
data: payload.data,
});
return result.data;
} catch (error) {
if (!error.response) {
throw error;
}
return rejectWithValue(error.response.data);
}
},
);
export const enrollmentSlice = createSlice({
name: 'enrollment',
initialState,
reducers: {
setRefetch: (state, action: PayloadAction<boolean>) => {
state.refetch = action.payload;
},
},
extraReducers: (builder) => {
builder.addCase(fetch.pending, (state) => {
state.loading = true;
resetNotify(state);
});
builder.addCase(fetch.rejected, (state, action) => {
state.loading = false;
rejectNotify(state, action);
});
builder.addCase(fetch.fulfilled, (state, action) => {
if (action.payload.rows && action.payload.count >= 0) {
state.enrollment = action.payload.rows;
state.count = action.payload.count;
} else {
state.enrollment = action.payload;
}
state.loading = false;
});
builder.addCase(deleteItemsByIds.pending, (state) => {
state.loading = true;
resetNotify(state);
});
builder.addCase(deleteItemsByIds.fulfilled, (state) => {
state.loading = false;
fulfilledNotify(state, 'Enrollment has been deleted');
});
builder.addCase(deleteItemsByIds.rejected, (state, action) => {
state.loading = false;
rejectNotify(state, action);
});
builder.addCase(deleteItem.pending, (state) => {
state.loading = true;
resetNotify(state);
});
builder.addCase(deleteItem.fulfilled, (state) => {
state.loading = false;
fulfilledNotify(state, `${'Enrollment'.slice(0, -1)} has been deleted`);
});
builder.addCase(deleteItem.rejected, (state, action) => {
state.loading = false;
rejectNotify(state, action);
});
builder.addCase(create.pending, (state) => {
state.loading = true;
resetNotify(state);
});
builder.addCase(create.rejected, (state, action) => {
state.loading = false;
rejectNotify(state, action);
});
builder.addCase(create.fulfilled, (state) => {
state.loading = false;
fulfilledNotify(state, `${'Enrollment'.slice(0, -1)} has been created`);
});
builder.addCase(update.pending, (state) => {
state.loading = true;
resetNotify(state);
});
builder.addCase(update.fulfilled, (state) => {
state.loading = false;
fulfilledNotify(state, `${'Enrollment'.slice(0, -1)} has been updated`);
});
builder.addCase(update.rejected, (state, action) => {
state.loading = false;
rejectNotify(state, action);
});
builder.addCase(uploadCsv.pending, (state) => {
state.loading = true;
resetNotify(state);
});
builder.addCase(uploadCsv.fulfilled, (state) => {
state.loading = false;
fulfilledNotify(state, 'Enrollment has been uploaded');
});
builder.addCase(uploadCsv.rejected, (state, action) => {
state.loading = false;
rejectNotify(state, action);
});
},
});
// Action creators are generated for each case reducer function
export const { setRefetch } = enrollmentSlice.actions;
export default enrollmentSlice.reducer;

2
frontend/src/stores/store.ts
View File

@ -12,7 +12,6 @@ import parentsSlice from './parents/parentsSlice';
import studentsSlice from './students/studentsSlice'; import studentsSlice from './students/studentsSlice';
import rolesSlice from './roles/rolesSlice'; import rolesSlice from './roles/rolesSlice';
import permissionsSlice from './permissions/permissionsSlice'; import permissionsSlice from './permissions/permissionsSlice';
import enrollmentSlice from './enrollment/enrollmentSlice';
export const store = configureStore({ export const store = configureStore({
reducer: { reducer: {
@ -29,7 +28,6 @@ export const store = configureStore({
students: studentsSlice, students: studentsSlice,
roles: rolesSlice, roles: rolesSlice,
permissions: permissionsSlice, permissions: permissionsSlice,
enrollment: enrollmentSlice,
}, },
}); });