kutafaja
/
klnodekb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android Accessdetails javítva

This commit is contained in:
Vincze József 2025-02-19 14:58:33 +01:00
parent 644d5aad5b
commit 2af3777a42
2 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/androidApi.js
View File

@ -190,26 +190,17 @@ exports.apiCheckDevice=function(deviceId, callback){
});
}
exports.apiEmployee=function(apiKey, callback){
exports.apiEmployee=async function(apiKey){
Employee.findOne({'apiKey':apiKey}, function(err,employee)
{
if (err)
{
callback(err,null);
}
else
{
employee= await Employee.findOne({'apiKey':apiKey})//, function(err,employee)
if (employee)
{
var mpe=false;
if (employee.mobilePortalAccessEnabled==true) mpe=true;
callback(null,{'name':employee.name,'id':employee._id, 'isForeman':employee.isForeman,'mobilePortalAccessEnabled':mpe});
return {'name':employee.name,'id':employee._id, 'isForeman':employee.isForeman,'mobilePortalAccessEnabled':mpe};
}
else
callback(null,null);
}
});
return null;
};
// Egy havi munkaidő összegzés

25
routes/employee.js
View File

@ -4123,22 +4123,13 @@ router.get('/androidList/:uid', function (req, res) {
});
// Havi munkaidők lekérdezése egymunkavállalóra AJAX Route
router.get('/androidAccessList/:apiKey/:mindate', function(req, res) {
router.get('/androidAccessList/:apiKey/:mindate', async function(req, res) {
var resp=await androidApi.apiEmployee(req.params.apiKey)//,function(err,resp){
androidApi.apiEmployee(req.params.apiKey,function(err,resp){
if (err){
console.log(err);
return;
}
else
{
if (resp==null) {res.send({'result':'Error'}); return;}
getHolidayListById(resp.id,moment(req.params.mindate,'YYYY.MM').format('MM.YYYY'),req.params.mindate,function(err,holidaysArray){
if (err)
{
console.log("Holiday Err: "+err);
}
else
var holidaysArray=await getHolidayListById(resp.id,moment(req.params.mindate,'YYYY.MM').format('MM.YYYY'),req.params.mindate);//,function(err,holidaysArray){
if (holidaysArray)
{
@ -4230,9 +4221,9 @@ router.get('/androidAccessList/:apiKey/:mindate', function(req, res) {
}
});
}
}); // End of Holiday list
}
});
//}); // End of Holiday list
// }
// });
});