Skip to content

LIMS-2041: Remove date-fns and date-fns-tz #1020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndg63276 merged 1 commit into from
Feb 3, 2026
Merged

LIMS-2041: Remove date-fns and date-fns-tz #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 3 additions & 26 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
"d3-scale": "^3.2.3",
"d3-scale-chromatic": "^2.0.0",
"d3-selection": "^2.0.0",
"date-fns": "^2.16.1",
"date-fns-tz": "^1.0.12",
"flot-axislabels": "^1.0.0",
"flot-pie": "^1.0.0",
"font-awesome": "^4.2.0",
Expand Down
5 changes: 2 additions & 3 deletions client/src/js/modules/shipment/views/container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ define(['marionette',
'views/table',

'utils',
'formatDate',
'utils/editable',
'templates/shipment/container.html'], function(Marionette,
Backbone,
Expand All @@ -40,7 +39,7 @@ define(['marionette',

TableView,

utils, formatDate,
utils,
Editable, template){

return Marionette.LayoutView.extend({
Expand Down Expand Up @@ -186,7 +185,7 @@ define(['marionette',
app.alert({ message: 'Container Successfully Queued' })
self.model.set({
CONTAINERQUEUEID: resp.CONTAINERQUEUEID,
QUEUEDTIMESTAMP: formatDate.default(new Date(), 'dd-MM-yyyy HH:mm')
QUEUEDTIMESTAMP: new Date().toLocaleString()
})
self.updateAutoCollection()
self.sampletable.toggleAuto(true)
Expand Down
5 changes: 2 additions & 3 deletions client/src/js/modules/shipment/views/dewarregistry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ define(['marionette', 'backgrid',
'views/form',
'views/filter',
'views/table', 'utils/table',
'formatDate',
'templates/shipment/dewarregistryadd.html',
'templates/shipment/dewarregistry.html'],
function(Marionette, Backgrid, DewarRegistry, DewarProposal,
Proposals, LabContacts,
FormView, FilterView,
TableView, table, formatDate, addtemplate, template) {
TableView, table, addtemplate, template) {

var ClickableRow = table.ClickableRow.extend({
event: 'rdewar:show',
Expand Down Expand Up @@ -49,7 +48,7 @@ define(['marionette', 'backgrid',
this.ui.fc.val('')
this.ui.date.val('')
this.ui.serial.val('')
this.model.set({ DEWARS: 0, REPORTS: 0, BLTIMESTAMP: formatDate.default(new Date(), 'yyyy-MM-dd HH:mm:ss') })
this.model.set({ DEWARS: 0, REPORTS: 0, BLTIMESTAMP: new Date().toLocaleString('sv-SE') })
this.trigger('model:saved', this.model)
this.setupValidation()
},
Expand Down
7 changes: 3 additions & 4 deletions client/src/js/modules/stats/views/breakdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
define(['marionette', 'templates/stats/breakdown.html',
'utils',
'formatDate',
'jquery',
'jquery.flot',
'jquery.flot.time',
'jquery.flot.selection',
'jquery.flot.tooltip',
], function(Marionette, template, utils, formatDate, $) {
], function(Marionette, template, utils, $) {

return Marionette.ItemView.extend({
template: template,
Expand Down Expand Up @@ -101,8 +100,8 @@ define(['marionette', 'templates/stats/breakdown.html',
if (this.hideOverview) return
var opts = this.main.getOptions()

var from = formatDate.default(opts.xaxes[0].min, 'MMMM do yyyy')
var to = formatDate.default(opts.xaxes[0].max, 'MMMM do yyyy')
var from = new Date(opts.xaxes[0].min).toLocaleDateString();
var to = new Date(opts.xaxes[0].max).toLocaleDateString();

if (from != to) this.ui.span.text(from+' - '+to)
else this.ui.span.text(from)
Expand Down
3 changes: 1 addition & 2 deletions client/src/js/modules/types/mx/shipment/views/mx-container-view.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@
</template>

<script>
import formatDate from 'date-fns-tz/format'
import { ValidationObserver, ValidationProvider } from 'vee-validate'

import ContainerHistory from 'modules/shipment/collections/containerhistory'
Expand Down Expand Up @@ -546,7 +545,7 @@ export default {
const response = await this.toggleContainerQueue(true, this.containerId)
this.$emit('update-container-state', {
CONTAINERQUEUEID: response.get('CONTAINERQUEUEID'),
QUEUEDTIMESTAMP: formatDate(new Date(), 'dd-MM-yyyy HH:mm')
QUEUEDTIMESTAMP: new Date().toLocaleString()
})
this.$nextTick(() => {
this.loadContainerData()
Expand Down
1 change: 0 additions & 1 deletion client/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ module.exports = (env, argv) => ({
vue: 'vue/dist/vue.min',
veevalidate: 'vee-validate/dist/vee-validate.min',
luxon: 'luxon',
formatDate: 'date-fns/format',

js: path.resolve(__dirname, 'src/js'),
css: path.resolve(__dirname, 'src/css'),
Expand Down
Loading