From c252c92cd9e78f6046ea5e9c82f2842f559368bc Mon Sep 17 00:00:00 2001
From: jpl
Date: Tue, 18 Jul 2017 12:35:03 +0200
Subject: Refs #4113: updating calendar filter on VJ
---
.../vehicle_journeys/components/tools/select2s/TimetableSelect2.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'app/assets/javascripts')
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
index b236e7d94..dd098053e 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
@@ -2,6 +2,7 @@ var _ = require('lodash')
var React = require('react')
var PropTypes = require('react').PropTypes
var Select2 = require('react-select2')
+var actions = require('../../../actions')
// get JSON full path
var origin = window.location.origin
@@ -37,13 +38,12 @@ class BSelect4 extends React.Component{
};
},
processResults: function(data, params) {
-
return {
results: data.map(
item => _.assign(
{},
item,
- {text: item.comment}
+ {text: '' + item.short_id + ' - ' + (item.color ? " - " : '') + item.comment + '
' + item.day_types.match(/[A-Z]?[a-z]+/g).join(', ') + ''}
)
)
};
@@ -51,6 +51,7 @@ class BSelect4 extends React.Component{
cache: true
},
minimumInputLength: 3,
+ escapeMarkup: function (markup) { return markup; },
templateResult: formatRepo
}}
/>
--
cgit v1.2.3
From 637fb8557d4bcd183d890607ae51792a5bcc1ecc Mon Sep 17 00:00:00 2001
From: jpl
Date: Tue, 18 Jul 2017 14:06:12 +0200
Subject: Refs #4114: updating MissionSelect2 on VJ
---
.../vehicle_journeys/components/tools/select2s/MissionSelect2.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'app/assets/javascripts')
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
index b3df767ab..89746da02 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
@@ -43,7 +43,7 @@ class BSelect4 extends React.Component{
item => _.assign(
{},
item,
- { text: 'Nom: ' + item.published_name + '
Code: ' + item.registration_number + '
ID: ' + _.last(_.split(item.object_id, ':')) }
+ { text: '' + _.last(_.split(item.object_id, ':')) + " - " + item.published_name + "
" + item.registration_number + "" }
)
)
};
--
cgit v1.2.3
From 4d6dc16a98aea55f89a3ae3fe5360fa182f62fac Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Wed, 19 Jul 2017 11:56:14 +0200
Subject: Refs #4129 Change minimumInputLength for VJ select2
---
.../vehicle_journeys/components/tools/select2s/CompanySelect2.js | 2 +-
.../vehicle_journeys/components/tools/select2s/MissionSelect2.js | 2 +-
.../vehicle_journeys/components/tools/select2s/TimetableSelect2.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'app/assets/javascripts')
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/CompanySelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/CompanySelect2.js
index a6b8dcfa1..d277be003 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/CompanySelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/CompanySelect2.js
@@ -51,7 +51,7 @@ class BSelect4 extends React.Component{
},
cache: true
},
- minimumInputLength: 3,
+ minimumInputLength: 1,
templateResult: formatRepo
}}
/>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
index 89746da02..89c8fca00 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
@@ -50,7 +50,7 @@ class BSelect4 extends React.Component{
},
cache: true
},
- minimumInputLength: 0,
+ minimumInputLength: 1,
escapeMarkup: function (markup) { return markup; },
templateResult: formatRepo
}}
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
index dd098053e..a4df10369 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
@@ -50,7 +50,7 @@ class BSelect4 extends React.Component{
},
cache: true
},
- minimumInputLength: 3,
+ minimumInputLength: 1,
escapeMarkup: function (markup) { return markup; },
templateResult: formatRepo
}}
--
cgit v1.2.3
From cd22d9c013b6100e84d9199265482a0373834b48 Mon Sep 17 00:00:00 2001
From: jpl
Date: Wed, 19 Jul 2017 15:32:07 +0200
Subject: Refs #4128: updating autocomplete component results display
---
.../vehicle_journeys/components/tools/select2s/MissionSelect2.js | 2 +-
.../vehicle_journeys/components/tools/select2s/TimetableSelect2.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'app/assets/javascripts')
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
index 89c8fca00..c04a1d642 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
@@ -43,7 +43,7 @@ class BSelect4 extends React.Component{
item => _.assign(
{},
item,
- { text: '' + _.last(_.split(item.object_id, ':')) + " - " + item.published_name + "
" + item.registration_number + "" }
+ { text: "" + item.published_name + _.last(_.split(item.object_id, ':')) + "
" + item.registration_number + "" }
)
)
};
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
index a4df10369..3e81290f5 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
@@ -43,7 +43,7 @@ class BSelect4 extends React.Component{
item => _.assign(
{},
item,
- {text: '' + item.short_id + ' - ' + (item.color ? " - " : '') + item.comment + '
' + item.day_types.match(/[A-Z]?[a-z]+/g).join(', ') + ''}
+ {text: '' + (item.color ? " " : '') + item.comment + ' - ' + item.short_id + '
' + item.day_types.match(/[A-Z]?[a-z]+/g).join(', ') + ''}
)
)
};
--
cgit v1.2.3