Skip to content
This repository was archived by the owner on Jan 14, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/lib/database/views/runs_views.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
const queryForRunsFields = `
--p.name,
r.run_number,
r.time_o2_start,
r.time_o2_end,
r.time_trg_start,
r.time_trg_end,
extract( epoch from r.time_o2_start ) * 1000 as time_o2_start,
extract( epoch from r.time_o2_end ) * 1000 as time_o2_end,
extract( epoch from r.time_trg_start ) * 1000 as time_trg_start,
extract( epoch from r.time_trg_end ) * 1000 as time_trg_end,
get_center_of_mass_energy(r.energy_per_beam, p.beam_type_id) as center_of_mass_energy,
r.fill_number,
r.l3_current,
Expand Down
11 changes: 11 additions & 0 deletions app/public/utils/dataProcessing/dataProcessingUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
* or submit itself to any jurisdiction.
*/

import { h } from '/js/src/index.js';

export const extractPeriodName = (dataPassName) => {
const [period] = dataPassName.split('_');
return period;
Expand Down Expand Up @@ -56,3 +58,12 @@ export const getReadableFileSizeString = (fileSizeInBytes) => {

return `${Math.max(result.fileSize, 0.1).toFixed(1)} ${byteUnits[result.index]}`;
};

export const dateFormatter = (sec) => {
const cestOffset = 2 * 60 * 60 * 1000;
const localOffset = new Date().getTimezoneOffset() * 60 * 1000;
const d = new Date(Number(sec) + cestOffset + localOffset);
const dateString = d.toLocaleDateString();
const timeString = d.toLocaleTimeString();
return h('', h('.skinny', dateString), timeString);
};
4 changes: 2 additions & 2 deletions app/public/views/userView/data/headersSpecials.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ const { fieldNames: fN } = RCT;
const runFields = {
name: 'Name',
run_number: 'Run',
time_start: 'Start time',
time_end: 'End time',
time_o2_start: 'O2 start time',
time_o2_end: 'O2 end time',
time_trg_start: 'Trg. start',
time_trg_end: 'Trg. end',
center_of_mass_energy: h('.center-of-mass-energy'),
Expand Down
15 changes: 3 additions & 12 deletions app/public/views/userView/data/pagesCellsSpecials.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
import { h } from '/js/src/index.js';
import { RCT } from '../../../config.js';
import { getReadableFileSizeString } from '../../../utils/dataProcessing/dataProcessingUtils.js';
import { getReadableFileSizeString, dateFormatter } from '../../../utils/dataProcessing/dataProcessingUtils.js';
import linkChip from '../../../components/chips/linkChip.js';
import { buildHref } from '../../../utils/url/urlUtils.js';
const { dataReqParams: DRP, pageNames: PN, outerServices } = RCT;
Expand Down Expand Up @@ -94,19 +94,10 @@ pagesCellsSpecials[PN.mc] = {
],
};

const dateFormatter = (sec) => {
const cestOffset = 2 * 60 * 60 * 1000;
const localOffset = new Date().getTimezoneOffset() * 60 * 1000;
const d = new Date(Number(sec) + cestOffset + localOffset);
const dateString = d.toLocaleDateString();
const timeString = d.toLocaleTimeString();
return h('', h('.skinny', dateString), timeString);
};

pagesCellsSpecials[PN.runsPerPeriod] = {
run_number: (_, item) => h('.thick', item.run_number),
time_start: (_, item) => dateFormatter(item.time_start),
time_end: (_, item) => dateFormatter(item.time_end),
time_o2_start: (_, item) => dateFormatter(item.time_o2_start),
time_o2_end: (_, item) => dateFormatter(item.time_o2_end),
time_trg_start: (_, item) => dateFormatter(item.time_trg_start),
time_trg_end: (_, item) => dateFormatter(item.time_trg_end),
fill_number: (_, item) => h('a', {
Expand Down