Compare commits
2 Commits
7606afcf11
...
c233be5d80
| Author | SHA1 | Date | |
|---|---|---|---|
| c233be5d80 | |||
| 664a3a4884 |
@ -3,7 +3,7 @@ import { isAuthenticated } from '../../keycloak.js';
|
|||||||
|
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
|
|
||||||
const listAllowedFilters = ['state', 'gcodeFile._id', 'quantity'];
|
const listAllowedFilters = ['state', 'gcodeFile._id', 'quantity', '_id', '_reference'];
|
||||||
const propertiesAllowedFilters = ['state'];
|
const propertiesAllowedFilters = ['state'];
|
||||||
import {
|
import {
|
||||||
listJobsRouteHandler,
|
listJobsRouteHandler,
|
||||||
@ -16,8 +16,7 @@ import {
|
|||||||
getJobHistoryRouteHandler,
|
getJobHistoryRouteHandler,
|
||||||
searchJobsRouteHandler,
|
searchJobsRouteHandler,
|
||||||
getJobPropertyValuesRouteHandler,
|
getJobPropertyValuesRouteHandler,
|
||||||
|
getJobNeighborsRouteHandler,
|
||||||
getJobNeighborsRouteHandler
|
|
||||||
} from '../../services/production/jobs.js';
|
} from '../../services/production/jobs.js';
|
||||||
import { convertPropertiesString, getFilter } from '../../utils.js';
|
import { convertPropertiesString, getFilter } from '../../utils.js';
|
||||||
|
|
||||||
@ -47,7 +46,6 @@ router.get('/search', isAuthenticated, (req, res) => {
|
|||||||
searchJobsRouteHandler(req, res, search);
|
searchJobsRouteHandler(req, res, search);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
router.post('/', isAuthenticated, (req, res) => {
|
router.post('/', isAuthenticated, (req, res) => {
|
||||||
newJobRouteHandler(req, res);
|
newJobRouteHandler(req, res);
|
||||||
});
|
});
|
||||||
|
|||||||
@ -16,7 +16,16 @@ import {
|
|||||||
} from '../../services/production/printers.js';
|
} from '../../services/production/printers.js';
|
||||||
import { convertPropertiesString, getFilter } from '../../utils.js';
|
import { convertPropertiesString, getFilter } from '../../utils.js';
|
||||||
|
|
||||||
const listAllowedFilters = ['tags', 'host._id', 'active', 'online', 'name', '_id', '_reference'];
|
const listAllowedFilters = [
|
||||||
|
'tags',
|
||||||
|
'host._id',
|
||||||
|
'active',
|
||||||
|
'online',
|
||||||
|
'name',
|
||||||
|
'_id',
|
||||||
|
'_reference',
|
||||||
|
'state',
|
||||||
|
];
|
||||||
const propertiesAllowedFilters = ['tags'];
|
const propertiesAllowedFilters = ['tags'];
|
||||||
// list of printers
|
// list of printers
|
||||||
router.get('/', isAuthenticated, (req, res) => {
|
router.get('/', isAuthenticated, (req, res) => {
|
||||||
|
|||||||
@ -3,7 +3,7 @@ import { isAuthenticated } from '../../keycloak.js';
|
|||||||
|
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
|
|
||||||
const listAllowedFilters = ['_id', 'job._id', 'printer._id'];
|
const listAllowedFilters = ['_id', 'job._id', 'printer._id', '_reference', 'state'];
|
||||||
const propertiesAllowedFilters = ['job'];
|
const propertiesAllowedFilters = ['job'];
|
||||||
import {
|
import {
|
||||||
listSubJobsRouteHandler,
|
listSubJobsRouteHandler,
|
||||||
@ -13,8 +13,7 @@ import {
|
|||||||
getSubJobHistoryRouteHandler,
|
getSubJobHistoryRouteHandler,
|
||||||
searchSubJobsRouteHandler,
|
searchSubJobsRouteHandler,
|
||||||
getSubJobPropertyValuesRouteHandler,
|
getSubJobPropertyValuesRouteHandler,
|
||||||
|
getSubJobNeighborsRouteHandler,
|
||||||
getSubJobNeighborsRouteHandler
|
|
||||||
} from '../../services/production/subjobs.js';
|
} from '../../services/production/subjobs.js';
|
||||||
import { getFilter, convertPropertiesString } from '../../utils.js';
|
import { getFilter, convertPropertiesString } from '../../utils.js';
|
||||||
|
|
||||||
@ -44,7 +43,6 @@ router.get('/search', isAuthenticated, (req, res) => {
|
|||||||
searchSubJobsRouteHandler(req, res, search);
|
searchSubJobsRouteHandler(req, res, search);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// get sub job stats
|
// get sub job stats
|
||||||
router.get('/stats', isAuthenticated, (req, res) => {
|
router.get('/stats', isAuthenticated, (req, res) => {
|
||||||
getSubJobStatsRouteHandler(req, res);
|
getSubJobStatsRouteHandler(req, res);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user