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

Updated via schema editor on 2025-06-19 01:28

Browse Source
This commit is contained in:
Flatlogic Bot 2025-06-19 01:29:47 +00:00
parent 8bb05f8fbb
commit a74660b879
22 changed files with 194 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -3,4 +3,7 @@
node_modules/
*/node_modules/
**/node_modules/
*/build/
*/build/
**/build/
.DS_Store
.env

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

File diff suppressed because one or more lines are too long

29
backend/src/db/api/units.js
View File

@ -17,6 +17,7 @@ module.exports = class UnitsDBApi {
unit_number: data.unit_number || null,
balance: data.balance || null,
unit_factor: data.unit_factor || null,
importHash: data.importHash || null,
createdById: currentUser.id,
updatedById: currentUser.id,
@ -41,6 +42,7 @@ module.exports = class UnitsDBApi {
unit_number: item.unit_number || null,
balance: item.balance || null,
unit_factor: item.unit_factor || null,
importHash: item.importHash || null,
createdById: currentUser.id,
updatedById: currentUser.id,
@ -68,6 +70,9 @@ module.exports = class UnitsDBApi {
if (data.balance !== undefined) updatePayload.balance = data.balance;
if (data.unit_factor !== undefined)
updatePayload.unit_factor = data.unit_factor;
updatePayload.updatedById = currentUser.id;
await units.update(updatePayload, { transaction });
@ -233,6 +238,30 @@ module.exports = class UnitsDBApi {
}
}
if (filter.unit_factorRange) {
const [start, end] = filter.unit_factorRange;
if (start !== undefined && start !== null && start !== '') {
where = {
...where,
unit_factor: {
...where.unit_factor,
[Op.gte]: start,
},
};
}
if (end !== undefined && end !== null && end !== '') {
where = {
...where,
unit_factor: {
...where.unit_factor,
[Op.lte]: end,
},
};
}
}
if (filter.active !== undefined) {
where = {
...where,

49
backend/src/db/migrations/1750296469103.js Normal file
View File

@ -0,0 +1,49 @@
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(
'units',
'unit_factor',
{
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('units', 'unit_factor', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

4
backend/src/db/models/units.js
View File

@ -22,6 +22,10 @@ module.exports = function (sequelize, DataTypes) {
type: DataTypes.DECIMAL,
},
unit_factor: {
type: DataTypes.INTEGER,
},
importHash: {
type: DataTypes.STRING(255),
allowNull: true,

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

@ -85,7 +85,7 @@ const MaintenanceRequestsData = [
description: 'Leaking faucet in kitchen',
status: 'in_progress',
status: 'completed',
request_date: new Date('2023-10-01T10:00:00Z'),
},
@ -105,7 +105,7 @@ const MaintenanceRequestsData = [
description: 'Heating not working',
status: 'in_progress',
status: 'pending',
request_date: new Date('2023-09-20T09:00:00Z'),
},
@ -115,7 +115,7 @@ const MaintenanceRequestsData = [
description: 'Elevator malfunction',
status: 'completed',
status: 'in_progress',
request_date: new Date('2023-10-02T11:15:00Z'),
},
@ -170,6 +170,8 @@ const UnitsData = [
// type code here for "relation_one" field
balance: 250,
unit_factor: 3,
},
{
@ -178,6 +180,8 @@ const UnitsData = [
// type code here for "relation_one" field
balance: 0,
unit_factor: 7,
},
{
@ -186,6 +190,8 @@ const UnitsData = [
// type code here for "relation_one" field
balance: 150,
unit_factor: 8,
},
{
@ -194,6 +200,8 @@ const UnitsData = [
// type code here for "relation_one" field
balance: 0,
unit_factor: 6,
},
];

6
backend/src/routes/units.js
View File

@ -24,6 +24,10 @@ router.use(checkCrudPermissions('units'));
* type: string
* default: unit_number
* unit_factor:
* type: integer
* format: int64
* balance:
* type: integer
* format: int64
@ -303,7 +307,7 @@ router.get(
const currentUser = req.currentUser;
const payload = await UnitsDBApi.findAll(req.query, { currentUser });
if (filetype && filetype === 'csv') {
const fields = ['id', 'unit_number', 'balance'];
const fields = ['id', 'unit_number', 'unit_factor', 'balance'];
const opts = { fields };
try {
const csv = parse(payload.rows, opts);

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

@ -54,7 +54,7 @@ module.exports = class SearchService {
const columnsInt = {
budgets: ['year', 'total_budget', 'expenses'],
units: ['balance'],
units: ['balance', 'unit_factor'],
};
let allFoundRecords = [];

14
cloudbuild.yaml Normal file
View File

@ -0,0 +1,14 @@
steps:
- name: 'gcr.io/cloud-builders/docker'
entrypoint: 'bash'
args: ['-c', 'docker pull gcr.io/fldemo-315215/condocloud-32325-dev:latest || exit 0']
- name: 'gcr.io/cloud-builders/docker'
args: [
'build',
'-t', 'gcr.io/fldemo-315215/condocloud-32325-dev:latest',
'--file', 'Dockerfile.dev',
'--cache-from', 'gcr.io/fldemo-315215/condocloud-32325-dev:latest',
'.'
]
images: ['gcr.io/fldemo-315215/condocloud-32325-dev:latest']
logsBucket: 'gs://fldemo-315215-cloudbuild-logs'

2
frontend/next-env.d.ts vendored
View File

@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />
// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

11
frontend/src/components/Units/CardUnits.tsx
View File

@ -106,6 +106,17 @@ const CardUnits = ({
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Unit Factor
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{item.unit_factor}
</div>
</dd>
</div>
</dl>
</li>
))}

5
frontend/src/components/Units/ListUnits.tsx
View File

@ -67,6 +67,11 @@ const ListUnits = ({
<p className={'text-xs text-gray-500 '}>Balance</p>
<p className={'line-clamp-2'}>{item.balance}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Unit Factor</p>
<p className={'line-clamp-2'}>{item.unit_factor}</p>
</div>
</Link>
<ListActionsPopover
onDelete={onDelete}

14
frontend/src/components/Units/configureUnitsCols.tsx
View File

@ -84,6 +84,20 @@ export const loadColumns = async (
type: 'number',
},
{
field: 'unit_factor',
headerName: 'Unit Factor',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
type: 'number',
},
{
field: 'actions',
type: 'actions',

10
frontend/src/pages/units/[unitsId].tsx
View File

@ -41,6 +41,8 @@ const EditUnits = () => {
owner: null,
balance: '',
unit_factor: '',
};
const [initialValues, setInitialValues] = useState(initVals);
@ -112,6 +114,14 @@ const EditUnits = () => {
<Field type='number' name='balance' placeholder='Balance' />
</FormField>
<FormField label='Unit Factor'>
<Field
type='number'
name='unit_factor'
placeholder='Unit Factor'
/>
</FormField>
<BaseDivider />
<BaseButtons>
<BaseButton type='submit' color='info' label='Submit' />

10
frontend/src/pages/units/units-edit.tsx
View File

@ -41,6 +41,8 @@ const EditUnitsPage = () => {
owner: null,
balance: '',
unit_factor: '',
};
const [initialValues, setInitialValues] = useState(initVals);
@ -110,6 +112,14 @@ const EditUnitsPage = () => {
<Field type='number' name='balance' placeholder='Balance' />
</FormField>
<FormField label='Unit Factor'>
<Field
type='number'
name='unit_factor'
placeholder='Unit Factor'
/>
</FormField>
<BaseDivider />
<BaseButtons>
<BaseButton type='submit' color='info' label='Submit' />

2
frontend/src/pages/units/units-list.tsx
View File

@ -30,7 +30,7 @@ const UnitsTablesPage = () => {
const [filters] = useState([
{ label: 'UnitNumber', title: 'unit_number' },
{ label: 'Unit Factor', title: 'unit_factor', number: 'true' },
{ label: 'Balance', title: 'balance', number: 'true' },
{ label: 'Owner', title: 'owner' },

10
frontend/src/pages/units/units-new.tsx
View File

@ -38,6 +38,8 @@ const initialValues = {
owner: '',
balance: '',
unit_factor: '',
};
const UnitsNew = () => {
@ -85,6 +87,14 @@ const UnitsNew = () => {
<Field type='number' name='balance' placeholder='Balance' />
</FormField>
<FormField label='Unit Factor'>
<Field
type='number'
name='unit_factor'
placeholder='Unit Factor'
/>
</FormField>
<BaseDivider />
<BaseButtons>
<BaseButton type='submit' color='info' label='Submit' />

2
frontend/src/pages/units/units-table.tsx
View File

@ -30,7 +30,7 @@ const UnitsTablesPage = () => {
const [filters] = useState([
{ label: 'UnitNumber', title: 'unit_number' },
{ label: 'Unit Factor', title: 'unit_factor', number: 'true' },
{ label: 'Balance', title: 'balance', number: 'true' },
{ label: 'Owner', title: 'owner' },

5
frontend/src/pages/units/units-view.tsx
View File

@ -70,6 +70,11 @@ const UnitsView = () => {
<p>{units?.balance || 'No data'}</p>
</div>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Unit Factor</p>
<p>{units?.unit_factor || 'No data'}</p>
</div>
<>
<p className={'block font-bold mb-2'}>Maintenance_requests Unit</p>
<CardBox

4
frontend/src/pages/users/users-view.tsx
View File

@ -151,6 +151,8 @@ const UsersView = () => {
<th>UnitNumber</th>
<th>Balance</th>
<th>Unit Factor</th>
</tr>
</thead>
<tbody>
@ -166,6 +168,8 @@ const UsersView = () => {
<td data-label='unit_number'>{item.unit_number}</td>
<td data-label='balance'>{item.balance}</td>
<td data-label='unit_factor'>{item.unit_factor}</td>
</tr>
))}
</tbody>

1
pids/backend.pid Normal file
View File

@ -0,0 +1 @@
4

1
pids/frontend.pid Normal file
View File

@ -0,0 +1 @@
3