aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/javascript/date_filters/calendar.js7
-rw-r--r--app/javascript/date_filters/compliance_check_set.js5
-rw-r--r--app/javascript/date_filters/compliance_control_set.js6
-rw-r--r--app/javascript/date_filters/import.js6
-rw-r--r--app/javascript/date_filters/index.js28
-rw-r--r--app/javascript/date_filters/time_table.js6
-rw-r--r--app/javascript/date_filters/workbench.js6
-rw-r--r--app/javascript/helpers/date_filters.js20
-rw-r--r--app/javascript/packs/application.js3
-rw-r--r--app/javascript/packs/date_filters.js2
-rw-r--r--app/javascript/packs/routes/edit.js23
-rw-r--r--app/javascript/routes/components/BSelect2.js6
-rw-r--r--app/javascript/routes/reducers/stopPoints.js6
-rw-r--r--app/javascript/time_tables/components/TagsSelect2.js2
-rw-r--r--app/javascript/vehicle_journeys/components/tools/select2s/CompanySelect2.js2
-rw-r--r--app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js2
-rw-r--r--app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js2
-rw-r--r--app/javascript/vehicle_journeys/components/tools/select2s/VJSelect2.js2
-rw-r--r--app/views/calendars/index.html.slim2
-rw-r--r--app/views/compliance_check_sets/_filters.html.slim2
-rw-r--r--app/views/compliance_control_sets/index.html.slim2
-rw-r--r--app/views/layouts/application.html.slim3
-rw-r--r--app/views/time_tables/index.html.slim2
-rw-r--r--app/views/workbenches/show.html.slim3
24 files changed, 76 insertions, 72 deletions
diff --git a/app/javascript/date_filters/calendar.js b/app/javascript/date_filters/calendar.js
index 266fcd16a..7e5f678e2 100644
--- a/app/javascript/date_filters/calendar.js
+++ b/app/javascript/date_filters/calendar.js
@@ -1,6 +1,5 @@
-const DateFilter = require('../helpers/date_filters')
+import DateFilter from '../helpers/date_filters'
-const calendarDF = new DateFilter("calendar_filter_btn", "Tous les champs du filtre de date doivent être remplis", "#q_contains_date_NUMi")
-
-module.exports = calendarDF
+const calendarDF = new DateFilter("calendar_filter_btn", "Tous les champs du filtre de date doivent être remplis", "q_contains_date_NUMi")
+export default calendarDF \ No newline at end of file
diff --git a/app/javascript/date_filters/compliance_check_set.js b/app/javascript/date_filters/compliance_check_set.js
new file mode 100644
index 000000000..09544a3cd
--- /dev/null
+++ b/app/javascript/date_filters/compliance_check_set.js
@@ -0,0 +1,5 @@
+import DateFilter from '../helpers/date_filters'
+
+const complianceCheckSetDF = new DateFilter("compliance_check_set_filter_btn", "Tous les champs du filtre de date doivent être remplis", "q_created_at_start_date_NUMi", "q_created_at_end_date_NUMi")
+
+export default complianceCheckSetDF \ No newline at end of file
diff --git a/app/javascript/date_filters/compliance_control_set.js b/app/javascript/date_filters/compliance_control_set.js
index 8ac90f54d..60d8e3bfa 100644
--- a/app/javascript/date_filters/compliance_control_set.js
+++ b/app/javascript/date_filters/compliance_control_set.js
@@ -1,5 +1,5 @@
-const DateFilter = require('../helpers/date_filters')
+import DateFilter from '../helpers/date_filters'
-const complianceControlSetDF = new DateFilter("compliance_control_set_filter_btn", "Tous les champs du filtre de date doivent être remplis", "#q_updated_at_start_date_NUMi", "#q_updated_at_end_date_NUMi")
+const complianceControlSetDF = new DateFilter("compliance_control_set_filter_btn", "Tous les champs du filtre de date doivent être remplis", "q_updated_at_start_date_NUMi", "q_updated_at_end_date_NUMi")
-module.exports = complianceControlSetDF \ No newline at end of file
+export default complianceControlSetDF \ No newline at end of file
diff --git a/app/javascript/date_filters/import.js b/app/javascript/date_filters/import.js
index 997dbd3f6..356371d30 100644
--- a/app/javascript/date_filters/import.js
+++ b/app/javascript/date_filters/import.js
@@ -1,5 +1,5 @@
-const DateFilter = require('../helpers/date_filters')
+import DateFilter from '../helpers/date_filters'
-const importDF = new DateFilter("import_filter_btn", "Tous les champs du filtre de date doivent être remplis", "#q_started_at_start_date_NUMi", "#q_started_at_end_date_NUMi")
+const importDF = new DateFilter("import_filter_btn", "Tous les champs du filtre de date doivent être remplis", "q_started_at_start_date_NUMi", "q_started_at_end_date_NUMi")
-module.exports = importDF \ No newline at end of file
+export default importDF \ No newline at end of file
diff --git a/app/javascript/date_filters/index.js b/app/javascript/date_filters/index.js
index 1e09c8cf6..ee892a7fe 100644
--- a/app/javascript/date_filters/index.js
+++ b/app/javascript/date_filters/index.js
@@ -1,13 +1,17 @@
-const calendarDF = require('./calendar')
-const complianceControlSetDF = require('./compliance_control_set')
-const timetableDF = require('./time_table')
-const importDF = require('./import')
-const workbenchDF = require('./workbench')
+import calendarDF from './calendar'
+import complianceControlSetDF from './compliance_control_set'
+import complianceCheckSetDF from './compliance_check_set'
+import timetableDF from './time_table'
+import importDF from './import'
+import workbenchDF from './workbench'
-module.exports = {
- calendarDF: () => calendarDF,
- complianceControlSetDF: () => complianceControlSetDF,
- timetableDF: () => timetableDF,
- importDF: () => importDF,
- workbenchDF: () => workbenchDF
-} \ No newline at end of file
+const DateFilters = {
+ calendarDF,
+ complianceCheckSetDF,
+ complianceControlSetDF,
+ importDF,
+ timetableDF,
+ workbenchDF
+}
+
+export default DateFilters \ No newline at end of file
diff --git a/app/javascript/date_filters/time_table.js b/app/javascript/date_filters/time_table.js
index e211bc12e..d26693993 100644
--- a/app/javascript/date_filters/time_table.js
+++ b/app/javascript/date_filters/time_table.js
@@ -1,5 +1,5 @@
-const DateFilter = require('../helpers/date_filters')
+import DateFilter from '../helpers/date_filters'
-const timetableDF = new DateFilter("time_table_filter_btn", "Tous les champs du filtre de date doivent être remplis", "#q_bounding_dates_start_date_NUMi", "#q_bounding_dates_end_date_NUMi")
+const timetableDF = new DateFilter("time_table_filter_btn", "Tous les champs du filtre de date doivent être remplis", "q_bounding_dates_start_date_NUMi", "q_bounding_dates_end_date_NUMi")
-module.exports = timetableDF
+export default timetableDF \ No newline at end of file
diff --git a/app/javascript/date_filters/workbench.js b/app/javascript/date_filters/workbench.js
index e5fd58e53..cc4112d73 100644
--- a/app/javascript/date_filters/workbench.js
+++ b/app/javascript/date_filters/workbench.js
@@ -1,3 +1,5 @@
-const DateFilter = require('../helpers/date_filters')
+import DateFilter from '../helpers/date_filters'
-const workbenchDF = new DateFilter("referential_filter_btn", "Tous les champs du filtre de date doivent être remplis", "#q_validity_period_start_date_NUMi", "#q_validity_period_end_date_NUMi")
+const workbenchDF = new DateFilter("referential_filter_btn", "Tous les champs du filtre de date doivent être remplis", "q_validity_period_start_date_NUMi", "q_validity_period_end_date_NUMi")
+
+export default workbenchDF \ No newline at end of file
diff --git a/app/javascript/helpers/date_filters.js b/app/javascript/helpers/date_filters.js
index 621e163ad..53c9da641 100644
--- a/app/javascript/helpers/date_filters.js
+++ b/app/javascript/helpers/date_filters.js
@@ -1,11 +1,11 @@
export default function DateFilter(buttonId, message, ...inputIds) {
- this.buttonId = buttonId
+ this.button = document.getElementById(buttonId)
this.inputIds = inputIds
this.message = message
const getVal = (str, key) => {
let newStr = str.replace(/NUM/, key)
- return $(newStr).val()
+ return document.getElementById(newStr).value
}
const getDates = () => {
@@ -13,20 +13,14 @@ export default function DateFilter(buttonId, message, ...inputIds) {
let newIds = [1, 2, 3].map(key => getVal(id, key))
arr.push(...newIds)
return arr
- },[])
+ }, [])
}
- const allInputFilled = () => {
- return getDates().every(date => !!date)
- }
-
- const noInputFilled = () => {
- return getDates().every(date => !date)
- }
-
- const button = document.getElementById(this.buttonId)
+ const allInputFilled = () => getDates().every(date => !!date)
- button && button.addEventListener('click', (event) => {
+ const noInputFilled = () => getDates().every(date => !date)
+
+ this.button && this.button.addEventListener('click', (event) => {
if (!allInputFilled() && !noInputFilled()) {
event.preventDefault()
alert(this.message)
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 54b106ee0..0b3711e53 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -7,4 +7,5 @@
// To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate
// layout file, like app/views/layouts/application.html.erb
-console.log('Hello World from Webpacker')
+// import jQuery from 'jquery'
+// import {} from 'jquery-ujs'
diff --git a/app/javascript/packs/date_filters.js b/app/javascript/packs/date_filters.js
index db58bd679..88f508152 100644
--- a/app/javascript/packs/date_filters.js
+++ b/app/javascript/packs/date_filters.js
@@ -1 +1 @@
-const DateFilter = require('../date_filters/index') \ No newline at end of file
+import DateFilter from '../date_filters' \ No newline at end of file
diff --git a/app/javascript/packs/routes/edit.js b/app/javascript/packs/routes/edit.js
index 810489353..d6ceed60f 100644
--- a/app/javascript/packs/routes/edit.js
+++ b/app/javascript/packs/routes/edit.js
@@ -1,21 +1,20 @@
-import React from 'react'
-import PropTypes from 'prop-types'
+import React, { PropTypes } from 'react'
import { render } from 'react-dom'
import { Provider } from 'react-redux'
import { createStore } from 'redux'
import reducers from '../../routes/reducers'
import App from '../../routes/components/App'
-import { handleForm, handleStopPoints } from '../../routes/form_helper'
+import formHelper from '../../routes/form_helper'
import clone from '../../helpers/clone'
let datas = clone(window, "itinerary_stop", true)
datas = JSON.parse(decodeURIComponent(datas))
// logger, DO NOT REMOVE
-// var applyMiddleware = require('redux').applyMiddleware
-// var createLogger = require('redux-logger')
-// var thunkMiddleware = require('redux-thunk').default
-// var promise = require('redux-promise')
+var applyMiddleware = require('redux').applyMiddleware
+var createLogger = require('redux-logger')
+var thunkMiddleware = require('redux-thunk').default
+var promise = require('redux-promise')
const getInitialState = () => {
let state = []
@@ -54,11 +53,11 @@ const getInitialState = () => {
}
var initialState = { stopPoints: getInitialState() }
-// const loggerMiddleware = createLogger()
+const loggerMiddleware = createLogger()
let store = createStore(
reducers,
- initialState
- // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
+ initialState,
+ applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
)
render(
@@ -75,8 +74,8 @@ document.querySelector('input[name=commit]').addEventListener('click', (event) =
let publicName = $("#route_published_name").val()
if (name == "" || publicName == "") {
event.preventDefault()
- handleForm("#route_name", "#route_published_name")
+ formHelper.handleForm("#route_name", "#route_published_name")
}
- handleStopPoints(event, state)
+ formHelper.handleStopPoints(event, state)
})
diff --git a/app/javascript/routes/components/BSelect2.js b/app/javascript/routes/components/BSelect2.js
index 5cc9561e9..340d9df95 100644
--- a/app/javascript/routes/components/BSelect2.js
+++ b/app/javascript/routes/components/BSelect2.js
@@ -1,6 +1,6 @@
import _ from'lodash'
import React, { Component, PropTypes } from 'react'
-import Select2 from 'react-select2-wrapper'
+import Select2 from 'react-select2'
// get JSON full path
@@ -8,7 +8,7 @@ var origin = window.location.origin
var path = window.location.pathname.split('/', 3).join('/')
-class BSelect3 extends Component{
+export default class BSelect3 extends Component {
constructor(props, context) {
super(props, context)
}
@@ -72,7 +72,7 @@ class BSelect3 extends Component{
}
}
-export default class BSelect2 extends Component{
+class BSelect2 extends Component{
componentDidMount() {
this.refs.newSelect.el.select2('open')
}
diff --git a/app/javascript/routes/reducers/stopPoints.js b/app/javascript/routes/reducers/stopPoints.js
index 25679e747..eeec06327 100644
--- a/app/javascript/routes/reducers/stopPoints.js
+++ b/app/javascript/routes/reducers/stopPoints.js
@@ -1,5 +1,5 @@
import _ from 'lodash'
-import { addInput } from '../form_helper'
+import formHelper from '../form_helper'
const stopPoint = (state = {}, action, length) => {
switch (action.type) {
@@ -23,8 +23,8 @@ const stopPoint = (state = {}, action, length) => {
const updateFormForDeletion = (stop) =>{
if (stop.stoppoint_id !== undefined){
let now = Date.now()
- addInput('id', stop.stoppoint_id, now)
- addInput('_destroy', 'true', now)
+ formHelper.addInput('id', stop.stoppoint_id, now)
+ formHelper.addInput('_destroy', 'true', now)
}
}
diff --git a/app/javascript/time_tables/components/TagsSelect2.js b/app/javascript/time_tables/components/TagsSelect2.js
index 24f473f42..22dc7aa9c 100644
--- a/app/javascript/time_tables/components/TagsSelect2.js
+++ b/app/javascript/time_tables/components/TagsSelect2.js
@@ -1,6 +1,6 @@
import React, { PropTypes, Component } from 'react'
import _ from 'lodash'
-import Select2 from 'react-select2-wrapper'
+import Select2 from 'react-select2'
// get JSON full path
let origin = window.location.origin
diff --git a/app/javascript/vehicle_journeys/components/tools/select2s/CompanySelect2.js b/app/javascript/vehicle_journeys/components/tools/select2s/CompanySelect2.js
index 03272e8b4..9c259630d 100644
--- a/app/javascript/vehicle_journeys/components/tools/select2s/CompanySelect2.js
+++ b/app/javascript/vehicle_journeys/components/tools/select2s/CompanySelect2.js
@@ -1,6 +1,6 @@
import _ from 'lodash'
import React, { PropTypes, Component } from 'react'
-import Select2 from 'react-select2-wrapper'
+import Select2 from 'react-select2'
// get JSON full path
let origin = window.location.origin
diff --git a/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js b/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js
index bf00a9d96..e4abdd651 100644
--- a/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js
+++ b/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js
@@ -1,6 +1,6 @@
import _ from 'lodash'
import React, { PropTypes, Component } from 'react'
-import Select2 from 'react-select2-wrapper'
+import Select2 from 'react-select2'
import actions from '../../../actions'
// get JSON full path
diff --git a/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js b/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
index 8463965b9..606bf8511 100644
--- a/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
+++ b/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
@@ -1,6 +1,6 @@
import _ from 'lodash'
import React, { PropTypes, Component } from 'react'
-import Select2 from 'react-select2-wrapper'
+import Select2 from 'react-select2'
import actions from '../../../actions'
// get JSON full path
diff --git a/app/javascript/vehicle_journeys/components/tools/select2s/VJSelect2.js b/app/javascript/vehicle_journeys/components/tools/select2s/VJSelect2.js
index 34273fcf6..e1af8816d 100644
--- a/app/javascript/vehicle_journeys/components/tools/select2s/VJSelect2.js
+++ b/app/javascript/vehicle_journeys/components/tools/select2s/VJSelect2.js
@@ -1,6 +1,6 @@
import _ from 'lodash'
import React, { PropTypes, Component } from 'react'
-import Select2 from 'react-select2-wrapper'
+import Select2 from 'react-select2'
import actions from '../../../actions'
// get JSON full path
diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim
index 24ed15484..d3168fa3d 100644
--- a/app/views/calendars/index.html.slim
+++ b/app/views/calendars/index.html.slim
@@ -49,4 +49,4 @@
.col-lg-12
= replacement_msg t('calendars.search_no_results')
-= javascript_include_tag 'filters/calendar.js'
+= javascript_pack_tag 'date_filters'
diff --git a/app/views/compliance_check_sets/_filters.html.slim b/app/views/compliance_check_sets/_filters.html.slim
index c5c968c6a..3051bda64 100644
--- a/app/views/compliance_check_sets/_filters.html.slim
+++ b/app/views/compliance_check_sets/_filters.html.slim
@@ -20,4 +20,4 @@
.actions
= link_to t('actions.erase'), @compliance_checks_sets, class: 'btn btn-link'
- = f.submit t('actions.filter'), class: 'btn btn-default', id: 'referential_filter_btn'
+ = f.submit t('actions.filter'), class: 'btn btn-default', id: 'compliance_check_set_filter_btn'
diff --git a/app/views/compliance_control_sets/index.html.slim b/app/views/compliance_control_sets/index.html.slim
index 22c65dabc..68173fee9 100644
--- a/app/views/compliance_control_sets/index.html.slim
+++ b/app/views/compliance_control_sets/index.html.slim
@@ -53,4 +53,4 @@
= replacement_msg t('compliance_control_sets.search_no_results')
-= javascript_include_tag 'filters/compliance_control_set.js' \ No newline at end of file
+= javascript_pack_tag 'date_filters' \ No newline at end of file
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index 496a53242..1bc9de136 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -11,8 +11,9 @@ html lang=I18n.locale
= stylesheet_link_tag 'base'
= stylesheet_link_tag 'application'
- = javascript_include_tag 'application'
= javascript_pack_tag 'application'
+ = javascript_include_tag 'application'
+
body
diff --git a/app/views/time_tables/index.html.slim b/app/views/time_tables/index.html.slim
index b984f95c8..c71a214f1 100644
--- a/app/views/time_tables/index.html.slim
+++ b/app/views/time_tables/index.html.slim
@@ -69,4 +69,4 @@
= javascript_tag do
| window.I18n = #{(I18n.backend.send(:translations).to_json).html_safe};
-= javascript_include_tag 'filters/time_table.js'
+= javascript_pack_tag 'date_filters'
diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim
index 80b5c16a2..32a933cc2 100644
--- a/app/views/workbenches/show.html.slim
+++ b/app/views/workbenches/show.html.slim
@@ -78,5 +78,4 @@
= javascript_tag do
| window.I18n = #{(I18n.backend.send(:translations).to_json).html_safe};
-/ = javascript_pack_tag 'date_filters/workbench'
-= javascript_pack_tag 'date_filters'
+= javascript_pack_tag 'date_filters' \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 15:20:37 +0000