Merge branch 'main' into branch-v2

This commit is contained in:
2025-04-01 13:56:58 +05:30
15 changed files with 1349 additions and 764 deletions

View File

@@ -1,6 +1,6 @@
import * as express from "express"; import * as express from "express";
import { widget3dService } from "../controller/visualization/3dWidgetService.ts"; import { widget3dService } from "../controller/visualization/3dWidgetService.ts";
const router = express.Router(); const router = express.Router();
router.post("/3dwidget/save", widget3dService.add3Dwidget); router.post("/3dwidget/save", widget3dService.add3Dwidget);
router.get("/3dwidgetData/:zoneId/:organization", widget3dService.get3Dwiget); router.get("/3dwidgetData/:zoneId/:organization", widget3dService.get3Dwiget);
export default router; export default router;

View File

@@ -1,106 +1,106 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import zoneSchema from "../../../shared/model/builder/lines/zone-Model.ts"; import zoneSchema from "../../../shared/model/builder/lines/zone-Model.ts";
import widget3dModel from "../../../shared/model/vizualization/3dwidget.ts"; import widget3dModel from "../../../shared/model/vizualization/3dwidget.ts";
export class widget3dService { export class widget3dService {
static async add3Dwidget(req: Request, res: Response): Promise<any> { static async add3Dwidget(req: Request, res: Response): Promise<any> {
try { try {
const { organization, widget, zoneId } = req.body; const { organization, widget, zoneId } = req.body;
const existingZone = await zoneSchema(organization).findOne({ const existingZone = await zoneSchema(organization).findOne({
zoneId: zoneId, zoneId: zoneId,
isArchive: false, isArchive: false,
}); });
if (!existingZone) if (!existingZone)
return res.status(404).json({ message: "Zone not found" }); return res.status(404).json({ message: "Zone not found" });
const existing3Dwidget = await widget3dModel(organization).findOne({ const existing3Dwidget = await widget3dModel(organization).findOne({
widgetID: widget.id, widgetID: widget.id,
isArchive: false, isArchive: false,
}); });
if (existing3Dwidget) { if (existing3Dwidget) {
const update3dwidget = await widget3dModel( const update3dwidget = await widget3dModel(
organization organization
).findOneAndUpdate( ).findOneAndUpdate(
{ {
widgetID: widget.id, widgetID: widget.id,
zoneId: zoneId, zoneId: zoneId,
isArchive: false, isArchive: false,
}, },
{ position: widget.position }, { position: widget.position },
{ upsert: true, new: true } { upsert: true, new: true }
); );
if (update3dwidget) if (update3dwidget)
return res return res
.status(200) .status(200)
.json({ message: "widget update successfully" }); .json({ message: "widget update successfully" });
else return res.send("Widget not updated"); else return res.send("Widget not updated");
} }
const newWidget3d = await widget3dModel(organization).create({ const newWidget3d = await widget3dModel(organization).create({
widgetName: widget.type, widgetName: widget.type,
widgetID: widget.id, widgetID: widget.id,
position: widget.position, position: widget.position,
zoneId, zoneId,
}); });
if (newWidget3d) if (newWidget3d)
return res.status(201).json({ message: "Widget created successfully" }); return res.status(201).json({ message: "Widget created successfully" });
} catch (error: any) { } catch (error: any) {
return res.status(500).send(error.message); return res.status(500).send(error.message);
} }
} }
static async get3Dwiget(req: Request, res: Response): Promise<any> { static async get3Dwiget(req: Request, res: Response): Promise<any> {
try { try {
const { organization, zoneId } = req.params; const { organization, zoneId } = req.params;
const existingZone = await zoneSchema(organization).findOne({ const existingZone = await zoneSchema(organization).findOne({
zoneId: zoneId, zoneId: zoneId,
isArchive: false, isArchive: false,
}); });
if (!existingZone) return res.send("Zone not found"); if (!existingZone) return res.send("Zone not found");
const widgetData = await widget3dModel(organization).find({ const widgetData = await widget3dModel(organization).find({
zoneId: zoneId, zoneId: zoneId,
isArchive: false, isArchive: false,
}); });
if (!widgetData || widgetData.length === 0) { if (!widgetData || widgetData.length === 0) {
return res.json([]); return res.json([]);
} }
const zonebasedWidget = widgetData.map((widget) => ({ const zonebasedWidget = widgetData.map((widget) => ({
Data: { Data: {
measurements: widget.Data?.measurements || {}, measurements: widget.Data?.measurements || {},
duration: widget.Data?.duration || "1h", duration: widget.Data?.duration || "1h",
}, },
type: widget.widgetName, type: widget.widgetName,
id: widget.widgetID, id: widget.widgetID,
position: widget.position, position: widget.position,
})); }));
return res.status(200).json(zonebasedWidget); return res.status(200).json(zonebasedWidget);
} catch (error: any) { } catch (error: any) {
return res.status(500).send(error.message); return res.status(500).send(error.message);
} }
} }
// static async update3Dposition(req: Request, res: Response): Promise<any> { // static async update3Dposition(req: Request, res: Response): Promise<any> {
// try { // try {
// const { organization, id, position, zoneId } = req.body; // const { organization, id, position, zoneId } = req.body;
// const existing3Dwidget = await widget3dModel(organization).findOne({ // const existing3Dwidget = await widget3dModel(organization).findOne({
// widgetID: id, // widgetID: id,
// isArchive: false, // isArchive: false,
// }); // });
// if (existing3Dwidget) { // if (existing3Dwidget) {
// const update3dwidget = await widget3dModel( // const update3dwidget = await widget3dModel(
// organization // organization
// ).findOneAndUpdate( // ).findOneAndUpdate(
// { // {
// widgetID: id, // widgetID: id,
// zoneId: zoneId, // zoneId: zoneId,
// isArchive: false, // isArchive: false,
// }, // },
// { position: position }, // { position: position },
// { upsert: true, new: true } // { upsert: true, new: true }
// ); // );
// if (update3dwidget) // if (update3dwidget)
// return res.status(200).send("widget update successfully"); // return res.status(200).send("widget update successfully");
// } else { // } else {
// return res.status(404).send("widget not found"); // return res.status(404).send("widget not found");
// } // }
// } catch (error: any) { // } catch (error: any) {
// return res.status(500).send(error.message); // return res.status(500).send(error.message);
// } // }
// } // }
} }

View File

@@ -35,7 +35,7 @@ export interface assetData extends Document {
}[]; }[];
position: []; position: [];
// rotation: []; // rotation: [];
rotation: { rotation: {
x: number; x: number;
y: number; y: number;
z: number; z: number;
@@ -72,7 +72,7 @@ const assetDataSchema: Schema = new Schema({
}, },
], ],
position: { type: Array}, position: { type: Array},
// rotation: { type: Array }, // rotation: { type: Array},
rotation: { rotation: {
x: { type: Number }, x: { type: Number },
y: { type: Number }, y: { type: Number },

View File

@@ -1,44 +1,44 @@
import mongoose, { Schema, Document, model } from "mongoose"; import mongoose, { Schema, Document, model } from "mongoose";
import MainModel from "../../connect/mongoose.ts"; import MainModel from "../../connect/mongoose.ts";
export interface floatingWidget extends Document { export interface floatingWidget extends Document {
className: string; className: string;
header: string; header: string;
floatWidgetID: string; floatWidgetID: string;
position: {}; position: {};
per: string; per: string;
value: string; value: string;
isArchive: boolean; isArchive: boolean;
zoneId: string; zoneId: string;
Data: { Data: {
measurements: {}; measurements: {};
duration: string; duration: string;
}; };
} }
const floatingWidgetSchema: Schema = new Schema( const floatingWidgetSchema: Schema = new Schema(
{ {
className: { type: String }, className: { type: String },
header: { type: String }, header: { type: String },
floatWidgetID: { type: String }, floatWidgetID: { type: String },
position: { type: Object }, position: { type: Object },
per: { type: String }, per: { type: String },
value: { type: String }, value: { type: String },
zoneId: { type: String }, zoneId: { type: String },
Data: { Data: {
measurements: { type: Object, default: {} }, measurements: { type: Object, default: {} },
duration: { type: String, default: "1h" }, duration: { type: String, default: "1h" },
}, },
isArchive: { type: Boolean, default: false }, isArchive: { type: Boolean, default: false },
}, },
{ timestamps: true } { timestamps: true }
); );
const floatWidgetModel = (db: any) => { const floatWidgetModel = (db: any) => {
return MainModel( return MainModel(
db, db,
"FloatingWidget", "FloatingWidget",
floatingWidgetSchema, floatingWidgetSchema,
"FloatingWidget" "FloatingWidget"
); );
}; };
export default floatWidgetModel; export default floatWidgetModel;

View File

@@ -0,0 +1,127 @@
import assetModel from "../../../shared/model/builder/assets/asset-Model.ts";
import actionModel from "../../../shared/model/simulation/actionmodel.ts";
import triggerModel from "../../../shared/model/simulation/triggersmodel.ts";
export const setAssetModel = async (data: any) => {
const {modeluuid, modelname,position,rotation, eventData,modelfileID,isLocked,isVisible,organization, }= data
console.log('data: ', data);
// const position=data.position
// const rotation=data.rotation
try {
const findvalue = await assetModel(organization).findOne({
modeluuid: modeluuid,
modelname: modelname,
});
if (findvalue) {
console.log('findvalue: ', findvalue);
const updatevalue = await assetModel(organization).findOneAndUpdate(
{ modeluuid: modeluuid, modelname: modelname },
{
position: position,
rotation: rotation,
isVisible: isVisible,
isLocked: isLocked,
},
{ new: true }
);
console.log('updatevalue: ', updatevalue);
return { success: true, message: 'Model updated successfully', data: updatevalue, organization: organization }
} else {
let assetData: any = {
modeluuid,
modelname,
position,
modelfileID,
rotation,
isLocked,
isVisible,
};
if (eventData) {
let pointRefs: any[] = [];
if (Array.isArray(eventData.points)) {
for (const point of eventData.points) {
let actionRefs: any[] = [];
let triggerRefs: any[] = [];
if (Array.isArray(point.actions)) {
for (const action of point.actions) {
const actionDoc = await actionModel(organization).create({
pointsUUID: point.uuid,
isArchive: false,
uuid: action.uuid,
name: action.name,
type: action.type,
material: action.material,
delay: action.delay,
spawn_Interval: action.spawn_Interval,
});
await actionDoc.save();
actionRefs.push(actionDoc._id);
}
}
if (Array.isArray(point.triggers)) {
for (const trigger of point.triggers) {
const triggerDoc = await triggerModel(organization).create({
pointsUUID: point.uuid,
isArchive: false,
uuid: trigger.uuid,
name: trigger.name,
type: trigger.type,
bufferTime: trigger.bufferTime,
});
await triggerDoc.save();
triggerRefs.push(triggerDoc._id);
}
}
pointRefs.push({
uuid: point.uuid,
position: point.position || [],
rotation: point.rotation || [],
actions: actionRefs,
triggers: triggerRefs,
});
}
}
assetData.speed = eventData.speed;
assetData.type = eventData.type;
assetData.points = pointRefs;
}
const assetDoc = await assetModel(organization).create(assetData);
await assetDoc.save();
// await assetDoc.save();
// if(assetDoc.)
const assetDatas={
modeluuid:assetDoc.modeluuid,modelname:assetDoc.modelname,modelfileID:assetDoc.modelfileID,position:assetDoc.position,rotation:assetDoc.rotation,isLocked:assetDoc.isLocked,isVisible:assetDoc.isVisible
,eventData:{points:assetDoc.points,type:assetDoc.type,speed:assetDoc.speed}
}
return { success: true, message:"Model created successfully", data: assetDatas, organization: organization }
}
} catch (error:any) {
// console.error("Error creating flooritems:", error);
return { success: false, message: error?.message || "Error occurred while ModelAsset", error, organization: organization }
}
}
export const deleteAssetModel = async (data: any)=>{
const { modeluuid,modelname,organization } = data;
try {
const findValue = await assetModel(organization).findOneAndDelete({modeluuid:modeluuid,modelname:modelname})
if (!findValue) {
return { success: false, message: 'model not found',organization:organization }
} else {
return { success: true, message: 'Model deleted successfully', data: findValue,organization:organization }
}
} catch (error) {
// console.error('Error get flooritems:', error);
return { success: false, message: 'Failed to delete asset', error,organization:organization }
}
}

View File

@@ -3,9 +3,9 @@ import { Socket } from "socket.io";
import cameraModel from "../../../shared/model/camera/camera-Model.ts"; import cameraModel from "../../../shared/model/camera/camera-Model.ts";
export const createCamera = async (data: any,) => { export const createCamera = async (data: any,) => {
const { userId, position, target, organization,rotation } = data
try { try {
const { userId, position, target, organization,rotation } = data
const findCamera = await cameraModel(organization).findOne({ userId: userId }) const findCamera = await cameraModel(organization).findOne({ userId: userId })
if (findCamera) { if (findCamera) {
@@ -18,14 +18,14 @@ export const createCamera = async (data: any,) => {
else { else {
const newCamera = await cameraModel(organization).create({ userId, position, target,rotation }) const newCamera = await cameraModel(organization).create({ userId, position, target,rotation })
return { success: false, message: 'Camera created' ,data:newCamera,organization:organization} return { success: true, message: 'Camera created' ,data:newCamera,organization:organization}
} }
// Send response with the created document // Send response with the created document
} catch (error) { } catch (error) {
console.error('Error creating camera:', error); console.error('Error creating camera:', error);
return { success: false, message: 'Error creating or updating camera', error, } return { success: false, message: 'Error creating or updating camera', error, organization:organization}
} }
} }

View File

@@ -4,8 +4,8 @@ import environmentModel from "../../../shared/model/environments/environments-Mo
export const setEnvironment = async (data: any,) => { export const setEnvironment = async (data: any,) => {
const { userId,roofVisibility,wallVisibility,shadowVisibility, organization } = data
try { try {
const { userId,roofVisibility,wallVisibility,shadowVisibility, organization } = data
const findvalue = await environmentModel(organization).findOne({ userId: userId }) const findvalue = await environmentModel(organization).findOne({ userId: userId })
if (findvalue) { if (findvalue) {
@@ -27,7 +27,7 @@ export const setEnvironment = async (data: any,) => {
// Send response with the created document // Send response with the created document
} catch (error) { } catch (error) {
console.error('Error creating evironments:', error); console.error('Error creating evironments:', error);
return { success: false, message: 'Error creating or updating evironments', error } return { success: false, message: 'Error creating or updating evironments', error ,organization:organization}
} }
} }

View File

@@ -3,21 +3,21 @@ import lineModel from "../../../shared/model/lines/lines-Model.ts";
export const createLineItems = async (data: any)=>{ export const createLineItems = async (data: any)=>{
const {organization,layer,line,type}=data
try { try {
const {organization,layer,line,type}=data
const newLine = await lineModel(organization).create({ layer,line,type }); const newLine = await lineModel(organization).create({ layer,line,type });
return { success: true, message: 'line create', data: newLine,organization:organization } return { success: true, message: 'line create', data: newLine,organization:organization }
// Send response with the created document // Send response with the created document
} catch (error) { } catch (error) {
return { success: false, message: 'Error create line', error } return { success: false, message: 'Error create line', error,organization:organization }
} }
} }
export const updateLineItems = async (data: any)=>{ export const updateLineItems = async (data: any)=>{
const {organization,uuid,position,}=data
try { try {
const {organization,uuid,position,}=data
// const findLine = await lineModel(organization).find({ 'line.uuid': uuid }); // const findLine = await lineModel(organization).find({ 'line.uuid': uuid });
// Update the position of the line matching the uuid // Update the position of the line matching the uuid
const updateResult = await lineModel(organization).updateMany( const updateResult = await lineModel(organization).updateMany(
@@ -29,13 +29,13 @@ export const updateLineItems = async (data: any)=>{
// Send response with the created document // Send response with the created document
} catch (error) { } catch (error) {
console.error('Error creating Lines:', error); console.error('Error creating Lines:', error);
return { success: false, message: 'Error updating line', error } return { success: false, message: 'Error updating line', error,organization:organization }
} }
} }
export const deleteLineItems = async (data: any)=>{ export const deleteLineItems = async (data: any)=>{
const {organization,line}=data
try { try {
const {organization,line}=data
const inputUuids = line.map((item: any) => item.uuid); const inputUuids = line.map((item: any) => item.uuid);
@@ -54,12 +54,12 @@ export const updateLineItems = async (data: any)=>{
} }
} catch (error) { } catch (error) {
console.error('Error delete Lines:', error); console.error('Error delete Lines:', error);
return { success: false, message: 'Failed to delete line', error } return { success: false, message: 'Failed to delete line', error ,organization:organization}
} }
} }
export const deleteLayer = async (data: any)=>{ export const deleteLayer = async (data: any)=>{
const {organization,layer}=data
try { try {
const {organization,layer}=data
const findValue = await lineModel(organization).find({ layer: layer }); const findValue = await lineModel(organization).find({ layer: layer });
@@ -77,12 +77,12 @@ export const updateLineItems = async (data: any)=>{
} }
} catch (error) { } catch (error) {
console.error('Error delete layer:', error); console.error('Error delete layer:', error);
return { success: false, message: 'Failed to delete layer', error } return { success: false, message: 'Failed to delete layer', error ,organization:organization}
} }
} }
export const deleteLinPoiteItems = async (data: any)=>{ export const deleteLinPoiteItems = async (data: any)=>{
const {organization,uuid}=data
try { try {
const {organization,uuid}=data
const findValue = await lineModel(organization).deleteMany({ 'line.uuid': uuid }) const findValue = await lineModel(organization).deleteMany({ 'line.uuid': uuid })
@@ -95,6 +95,6 @@ export const updateLineItems = async (data: any)=>{
} }
} catch (error) { } catch (error) {
console.error('Error delete Lines:', error); console.error('Error delete Lines:', error);
return { success: false, message: 'Failed to delete point', error } return { success: false, message: 'Failed to delete point', error ,organization:organization}
} }
} }

View File

@@ -1,9 +1,7 @@
import zoneModel from "../../../shared/model/lines/zone-Model.ts"; import zoneModel from "../../../shared/model/builder/lines/zone-Model.ts";
export const setZone = async (data: any) => { export const setZone = async (data: any) => {
const { organization, userId, zoneData } = data
try { try {
const { organization, userId, zoneData } = data
console.log('data: ', data);
const zoneId = zoneData.zoneId const zoneId = zoneData.zoneId
const points = zoneData.points const points = zoneData.points
const zoneName = zoneData.zoneName const zoneName = zoneData.zoneName
@@ -18,7 +16,7 @@ export const setZone = async (data: any) => {
return { success: true, message: 'zone updated', data: updateZone, organization: organization } return { success: true, message: 'zone updated', data: updateZone, organization: organization }
} else { } else {
const zoneCreate = await zoneModel(organization).create({ const zoneCreate = await zoneModel(organization).create({
zoneId, createBy: userId, zoneName: zoneName, points, layer, viewPortCenter, viewPortposition zoneId, createdBy: userId, zoneName: zoneName, points, layer, viewPortCenter, viewPortposition
}) })
const createdZone = await zoneModel(organization) const createdZone = await zoneModel(organization)
.findById(zoneCreate._id) .findById(zoneCreate._id)
@@ -28,18 +26,18 @@ export const setZone = async (data: any) => {
} }
} catch (error) { } catch (error) {
console.log('error: ', error); console.log('error: ', error);
return { success: false, message: 'Zone not found', error } return { success: false, message: 'Zone not found', error , organization: organization}
} }
} }
export const deleteZone = async (data: any) => { export const deleteZone = async (data: any) => {
const { organization, userId, zoneId } = data
try { try {
const { organization, userId, zoneId } = data
const findZoneId = await zoneModel(organization).findOne({ zoneId: zoneId }) const findZoneId = await zoneModel(organization).findOne({ zoneId: zoneId })
if (findZoneId) { if (findZoneId) {
const deleteZone = await zoneModel(organization).findOneAndDelete( const deleteZone = await zoneModel(organization).findOneAndDelete(
{ zoneId: zoneId, createBy: userId } { zoneId: zoneId, createdBy: userId }
).select("-_id -__v") ).select("-_id -__v")
return { success: true, message: 'zone deleted', data: deleteZone, organization: organization } return { success: true, message: 'zone deleted', data: deleteZone, organization: organization }
} else { } else {
@@ -48,6 +46,6 @@ export const deleteZone = async (data: any) => {
} }
} catch (error) { } catch (error) {
console.log('error: ', error); console.log('error: ', error);
return { success: false, message: 'Zone not found', error } return { success: false, message: 'Zone not found', error, organization: organization }
} }
} }

View File

@@ -2,6 +2,8 @@ import cameraModel from "../../../shared/model/camera/camera-Model.ts"
import userModel from "../../../shared/model/user-Model.ts" import userModel from "../../../shared/model/user-Model.ts"
export const activeUsers = async (data: any) => { export const activeUsers = async (data: any) => {
const {organization}=data
// console.log('data: ', data);
try { try {
if (data && data.email) { if (data && data.email) {
@@ -42,23 +44,25 @@ export const activeUsers = async (data: any) => {
// Handle the error or return a default value // Handle the error or return a default value
// Example: Return an error response if the email is invalid // Example: Return an error response if the email is invalid
return { success: false, message: 'Email is missing or invalid', } return { success: false, message: 'Email is missing or invalid', organization:organization }
// return res.status(400).send({ message: 'Email is missing or invalid' }); // return res.status(400).send({ message: 'Email is missing or invalid' });
} }
// // return []; // // return [];
} catch (error) { } catch (error:any) {
return { success: false, message: error?.message || "Error occurred while activeUser", error, organization: organization }
return { success: false, message:error}
// return { success: false, message:error}
} }
} }
export const activeUserOffline = async (data: any) => { export const activeUserOffline = async (data: any) => {
const email = data.email
const organization = email.split("@")[1].split(".")[0]
try { try {
const email = data.email
const organization = email.split("@")[1].split(".")[0]
const findUsers = await userModel(organization).findOne({email}) const findUsers = await userModel(organization).findOne({email})
// console.log('findUsers: ', findUsers); // console.log('findUsers: ', findUsers);
@@ -90,8 +94,44 @@ export const activeUserOffline = async (data: any) => {
} }
} }
// // return []; // // return [];
} catch (error) { } catch (error:any) {
return { success: false, message: error?.message || "Error occurred while activeUser", error, organization: organization }
return { success: false, message: error}
// return { success: false, message: error}
} }
} }
type OnlineUsersMap = Map<string, Set<string>>;
// export const addUserToOnlineList = async (
// organization: string,
// email: string,
// onlineUsers: OnlineUsersMap,
// socket: any,
// namespace: string
// ) => {
// if (!organization || !email) return;
// console.log('organization: ', organization);
// // Ensure the organization entry exists
// if (!onlineUsers.has(organization)) {
// onlineUsers.set(organization, new Set());
// }
// const findUser = await userModel(organization).findOne({email})
// if (!findUser) {
// return { success: false, message: "User not found", organization };
// }
// const userId = findUser._id;
// console.log(`🔍 Found user with ID: ${userId}`);
// // Add user to the online set
// onlineUsers.get(organization)!.add(userId);
// console.log(`✅ User ${userId} is online (Org: ${organization})`);
// // Emit updated online users list
// socket.emit("users:online", {
// organization,
// users: [...onlineUsers.get(organization)!],
// });
// };

View File

@@ -0,0 +1,58 @@
import floatWidgetModel from "../../../shared/model/vizualization/3dwidget.ts";
import zoneSchema from "../../../shared/model/builder/lines/zone-Model.ts";
export const addfloat = async (data: any) => {
const { organization, widget, zoneId } = data;
console.log('data: ', data);
try {
const existingZone = await zoneSchema(organization).findOne({
zoneId: zoneId,
isArchive: false,
});
if (!existingZone)
return { success: false, message: "Zone not found for the zoneId", organization: organization }
const existingFloatWidget = await floatWidgetModel(organization).findOne({
floatWidgetID: widget.id,
isArchive: false,
});
if (existingFloatWidget) {
const updateFloatWidget = await floatWidgetModel(organization).findOneAndUpdate(
{
floatWidgetID: widget.id,
isArchive: false,
},
{
$set: {
// Data: {
// // measurements: widget.Data.measurements || {},
// duration: widget.Data.duration || "1h",
// },
position: widget.position,
},
},
{
upsert: true,
new: true,
}
);
return { success: true, message: "Widget updated successfully", data: updateFloatWidget, organization: organization }
}
const newFloadWidget = await floatWidgetModel(organization).create({
className: widget.className,
header: widget.header,
floatWidgetID: widget.id,
position: widget.position,
per: widget.per,
value: widget.value,
zoneId: zoneId,
});
if (newFloadWidget) {
return { success: true, message: "FloatWidget created successfully", data: newFloadWidget, organization: organization }
}
} catch (error: any) {
return { success: false, message: error?.message || "Error occurred while float", error, organization: organization }
}
}

View File

@@ -0,0 +1,26 @@
import templateModel from "../../../shared/model/vizualization/templatemodel.ts";
export const addTemplate = async (data: any) => {
const { organization, templateID, name, panelOrder, widgets, snapshot } =data;
console.log('data: ', data);
try {
const existingTemplate = await templateModel(organization).findOne({
templateID: templateID,
isArchive: false,
});
if (existingTemplate)
return { success: false, message: "TemplateID alreay exists", organization: organization }
const newTemplate = await templateModel(organization).create({
templateID,
name,
panelOrder,
widgets,
snapshot,
});
if (newTemplate)
return { success: false, message: "Template saved successfully", data: newTemplate, organization: organization }
} catch (error: any) {
return { success: false, message: error?.message || "Error occurred while template", error, organization: organization }
}
}

View File

@@ -1,119 +1,119 @@
import panelSchema from "../../../shared/model/vizualization/panelmodel.ts"; import panelSchema from "../../../shared/model/vizualization/panelmodel.ts";
import widgetSchema from "../../../shared/model/vizualization/widgemodel.ts"; import widgetSchema from "../../../shared/model/vizualization/widgemodel.ts";
export const addWidget = async (data: any) => { export const addWidget = async (data: any) => {
const { organization,panel,zoneId,widget,} = data const { organization,panel,zoneId,widget,} = data
console.log('data: ', data); console.log('data: ', data);
try { try {
const existingPanel = await panelSchema(organization).findOne({ const existingPanel = await panelSchema(organization).findOne({
panelName: widget.panel, panelName: widget.panel,
zoneId: zoneId, zoneId: zoneId,
isArchive: false, isArchive: false,
}); });
if (!existingPanel) if (!existingPanel)
return { success: false, message: "panelName not found",organization: organization} return { success: false, message: "panelName not found",organization: organization}
if (existingPanel.panelName === widget.panel) { if (existingPanel.panelName === widget.panel) {
const existingWidget = await widgetSchema(organization).findOne({ const existingWidget = await widgetSchema(organization).findOne({
panelID: existingPanel._id, panelID: existingPanel._id,
widgetID: widget.id, widgetID: widget.id,
isArchive: false, isArchive: false,
// widgetOrder: widget.widgetOrder, // widgetOrder: widget.widgetOrder,
}); });
if (existingWidget) { if (existingWidget) {
const updateWidget = await widgetSchema( const updateWidget = await widgetSchema(
organization organization
).findOneAndUpdate( ).findOneAndUpdate(
{ {
panelID: existingPanel._id, panelID: existingPanel._id,
widgetID: widget.id, widgetID: widget.id,
isArchive: false, isArchive: false,
}, },
{ {
$set: { $set: {
panelID: existingPanel._id, panelID: existingPanel._id,
widgetID: widget.id, widgetID: widget.id,
Data: { Data: {
measurements: widget.Data.measurements, measurements: widget.Data.measurements,
duration: widget.Data.duration, duration: widget.Data.duration,
}, },
isArchive: false, isArchive: false,
}, },
}, },
{ upsert: true, new: true } // Upsert: create if not exists, new: return updated document { upsert: true, new: true } // Upsert: create if not exists, new: return updated document
); );
return { success: false, message: "Widget updated successfully",data:updateWidget,organization: organization} return { success: false, message: "Widget updated successfully",data:updateWidget,organization: organization}
} }
const newWidget = await widgetSchema(organization).create({ const newWidget = await widgetSchema(organization).create({
widgetID: widget.id, widgetID: widget.id,
elementType: widget.type, elementType: widget.type,
// widgetOrder: widgetOrder, // widgetOrder: widgetOrder,
widgetName: widget.widgetName, widgetName: widget.widgetName,
panelID: existingPanel._id, panelID: existingPanel._id,
widgetside: widget.panel, widgetside: widget.panel,
// Data: { // Data: {
// measurements: widget.Data.measurements || {}, // measurements: widget.Data.measurements || {},
// duration: widget.Data.duration || "1hr", // duration: widget.Data.duration || "1hr",
// }, // },
}); });
if (newWidget) { if (newWidget) {
existingPanel.widgets.push(newWidget._id); existingPanel.widgets.push(newWidget._id);
await existingPanel.save(); await existingPanel.save();
return { success: true, message: "Widget already exist for the widgetID",data:existingPanel,organization: organization} return { success: true, message: "Widget already exist for the widgetID",data:existingPanel,organization: organization}
} }
} }
return { success: false, message: "Type mismatch",organization: organization} return { success: false, message: "Type mismatch",organization: organization}
} catch (error: any) { } catch (error: any) {
return { success: false, message: 'widge not found', error,organization: organization } return { success: false, message: 'widge not found', error,organization: organization }
} }
} }
export const Widgetdelete = async (data: any) => { export const Widgetdelete = async (data: any) => {
const { widgetID, organization } = data const { widgetID, organization } = data
console.log('data: ', data); console.log('data: ', data);
try { try {
const findWidget = await widgetSchema(organization).findOne({ const findWidget = await widgetSchema(organization).findOne({
widgetID: widgetID, widgetID: widgetID,
isArchive: false, isArchive: false,
}); });
if (!findWidget) if (!findWidget)
return { success: false, message: "Widget not found",organization: organization} return { success: false, message: "Widget not found",organization: organization}
const widgetData = await widgetSchema(organization).updateOne( const widgetData = await widgetSchema(organization).updateOne(
{ _id: findWidget._id, isArchive: false }, { _id: findWidget._id, isArchive: false },
{ $set: { isArchive: true } } { $set: { isArchive: true } }
); );
if (widgetData) { if (widgetData) {
// Find all widgets in the same panel and sort them by widgetOrder // Find all widgets in the same panel and sort them by widgetOrder
const widgets = await widgetSchema(organization).find({ const widgets = await widgetSchema(organization).find({
panelID: findWidget.panelID, panelID: findWidget.panelID,
isArchive: false, isArchive: false,
}); });
// .sort({ widgetOrder: 1 }); // .sort({ widgetOrder: 1 });
// Reassign widgetOrder values // Reassign widgetOrder values
// for (let i = 0; i < widgets.length; i++) { // for (let i = 0; i < widgets.length; i++) {
// widgets[i].widgetOrder = (i + 1).toString(); // Convert to string // widgets[i].widgetOrder = (i + 1).toString(); // Convert to string
// await widgets[i].save(); // await widgets[i].save();
// } // }
const panelData = await panelSchema(organization).findOne({ const panelData = await panelSchema(organization).findOne({
_id: findWidget.panelID, _id: findWidget.panelID,
isArchive: false, isArchive: false,
}); });
if (panelData.widgets.includes(findWidget._id)) { if (panelData.widgets.includes(findWidget._id)) {
const index1 = panelData.widgets.indexOf(findWidget._id); const index1 = panelData.widgets.indexOf(findWidget._id);
panelData.widgets.splice(index1, 1); panelData.widgets.splice(index1, 1);
} }
const panelDeletedata = await panelData.save(); const panelDeletedata = await panelData.save();
console.log('Widget deleted successfully: '); console.log('Widget deleted successfully: ');
return { success: false, message: "Widget deleted successfully",data:panelDeletedata,organization: organization} return { success: false, message: "Widget deleted successfully",data:panelDeletedata,organization: organization}
} }
} catch (error: any) { } catch (error: any) {
return { success: false, message: error?.message || "An unknown error occurred.", error ,organization: organization} return { success: false, message: error?.message || "An unknown error occurred.", error ,organization: organization}
} }
} }

View File

@@ -2,8 +2,8 @@ export const EVENTS = {
connection: "connection", connection: "connection",
disconnect:"disconnect", disconnect:"disconnect",
//userActiveStatus //userActiveStatus
userConnect:"userConnectRespones", userConnect:"userConnectResponse",
userDisConnect:"userDisConnectRespones", userDisConnect:"userDisConnectResponse",
// Room management events // Room management events
joinRoom: 'joinRoom', joinRoom: 'joinRoom',
createroom: "createRoom", // When a client joins a room createroom: "createRoom", // When a client joins a room
@@ -59,4 +59,22 @@ export const EVENTS = {
widgetUpdateRespones:"viz-widget:response:updates", widgetUpdateRespones:"viz-widget:response:updates",
deleteWidget:"v2:viz-widget:delete", deleteWidget:"v2:viz-widget:delete",
widgetDeleteRespones:"viz-widget:response:delete", widgetDeleteRespones:"viz-widget:response:delete",
//float
addFloat: "v2:viz-float:add",
floatUpdateRespones: "viz-float:response:updates",
deleteFloat: "v2:viz-float:delete",
floatDeleteRespones: "viz-float:response:delete",
//template
addTemplate:"v2:viz-template:add",
templateUpdateRespones:"viz-template:response:updates",
//model-asset
setAssetModel: "v2:model-asset:add",
assetUpdateRespones: "model-asset:response:updates",
deleteAssetModel:"v2:model-asset:delete",
assetDeleteRespones: "model-asset:response:updates",
} }

File diff suppressed because it is too large Load Diff