scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-10 13:59:56 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6569 from aignatov-bio/ai-sci-9630-replace-datepicker-canvas

Browse source 
Replace datetime picker in canvas [SCI-9630]
This commit is contained in:
aignatov-bio 2023-11-02 15:10:22 +01:00 • committed by GitHub
commit 71cb370db1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/projects/canvas.js.erb
View file

@ -763,6 +763,8 @@ function bindEditDueDateAjax() {
editDueDateModalBody.html(data.html); editDueDateModalBody.html(data.html);
editDueDateModalTitle.text(data.title); editDueDateModalTitle.text(data.title);
window.initDateTimePickerComponent('#date-time-picker');
// Add listener to form inside modal // Add listener to form inside modal
editDueDateModalBody.find("form") editDueDateModalBody.find("form")
.on("ajax:success", function(ev2, data2, status2) { .on("ajax:success", function(ev2, data2, status2) {

4
app/javascript/vue/shared/date_time_picker.vue
View file

@ -50,6 +50,10 @@
}, },
watch: { watch: {
datetime: function () { datetime: function () {
if ( this.datetime == null) {
this.$emit('cleared');
}
if (this.defaultValue != this.datetime) { if (this.defaultValue != this.datetime) {
let newDate = this.datetime; let newDate = this.datetime;
if (this.mode == 'time') { if (this.mode == 'time') {

12
app/views/my_modules/_due_date.html.erb
View file

@ -1,7 +1,9 @@
<%= form_with model: @my_module, url: my_module_path(@my_module, format: :json), data: { remote: :true }, builder: SciFormHelper::SciFormBuilder do |f| %> <%= form_with model: @my_module, url: my_module_path(@my_module, format: :json), data: { remote: :true }, builder: SciFormHelper::SciFormBuilder do |f| %>
<%= f.datetime_picker :due_date, <label class="sci-label">
value: @my_module.due_date, <%= t('my_modules.due_date.label') %>
label: t('my_modules.due_date.label'), </label>
clear: true, <div id="date-time-picker" class="vue-date-time-picker">
time: true %> <input ref="input" type="hidden" v-model="date" name="my_module[due_date]" data-default="<%= @my_module.due_date %>" />
<date-time-picker class="w-64" @cleared="clearDate" ref="vueDateTime" @change="updateDate" mode="date"></date-time-picker>
</div>
<% end %> <% end %>