Skip to content

D
doodle
Commit 1ce66f23 by Arnaud
Options

fix wrong date

parent a17d2e0f
Showing with 27 additions and 29 deletions
dist/js/doodle.js
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
this.initLoad = () => { this.initLoad = () => {
this.getJsonData(); this.getJsonData();
console.log(this.json);
if(!this.json) { if(!this.json) {
console.warn('Invalid Json data'); console.warn('Invalid Json data');
return; return;
...@@ -42,7 +40,6 @@ ...@@ -42,7 +40,6 @@
* Create Table * Create Table
*/ */
this.createTable = (config) => { this.createTable = (config) => {
console.log(config);
$(document).on('click', 'input[type=checkbox]', this.eventInput); $(document).on('click', 'input[type=checkbox]', this.eventInput);
if(config.vertical) { if(config.vertical) {
...@@ -66,13 +63,15 @@ ...@@ -66,13 +63,15 @@
} }
}; };
this.createList = function() { this.createList = function() { // TODO : vertical
let div = $('<div>'); let div = $('<div>');
// DAYS => // DAYS =>
for(let index in this.days) { for(let index in this.days) {
let formatDateDay = moment(this.days[index], this.dateFormat).locale('fr').format('dddd DD'); let formatDateDay = moment(this.days[index], this.dateFormat).locale('fr').format('dddd DD');
let formatDateMonth = moment(this.days[index], this.dateFormat).locale('fr').format('MMMM'); let formatDateMonth = moment(this.days[index], this.dateFormat).locale('fr').format('MMMM');
let date = this.days[index];
let $h3 = $('<h5><span class="date_format"><b>' + formatDateDay + '</b></span> ' + formatDateMonth + '</td>'); let $h3 = $('<h5><span class="date_format"><b>' + formatDateDay + '</b></span> ' + formatDateMonth + '</td>');
div.append($h3); div.append($h3);
...@@ -85,7 +84,8 @@ ...@@ -85,7 +84,8 @@
} else { } else {
hour = hour.replace(':', 'h'); hour = hour.replace(':', 'h');
} }
$li.html(this.createInputBox(this.hours[index2], formatDateDay, hour));
$li.html(this.createInputBox(this.hours[index2], date, hour));
div.append($li); div.append($li);
} }
} }
...@@ -108,7 +108,6 @@ ...@@ -108,7 +108,6 @@
for(let index in this.days) { for(let index in this.days) {
let $tr = $('<tr>'); let $tr = $('<tr>');
let formatDateDay = moment(this.days[index], this.dateFormat).locale('fr').format('dddd DD'); let formatDateDay = moment(this.days[index], this.dateFormat).locale('fr').format('dddd DD');
let formatDateMonth = moment(this.days[index], this.dateFormat).locale('fr').format('MMMM'); let formatDateMonth = moment(this.days[index], this.dateFormat).locale('fr').format('MMMM');
...@@ -274,11 +273,8 @@ ...@@ -274,11 +273,8 @@
this.createJSON = () => { this.createJSON = () => {
let $input = $(this.config.inputSelector); let $input = $(this.config.inputSelector);
console.log($input);
if ($input.length > 0) { if ($input.length > 0) {
$input.val(JSON.stringify(this.outputJson)); $input.val(JSON.stringify(this.outputJson));
console.log($input.val());
} }
}; };
...@@ -287,7 +283,6 @@ ...@@ -287,7 +283,6 @@
* @param e event * @param e event
*/ */
this.eventInput = (e) => { this.eventInput = (e) => {
console.log("OUAIS");
let data = $(e.target).data('check').split('_'); let data = $(e.target).data('check').split('_');
let isChecked = $(e.target).is(':checked'); let isChecked = $(e.target).is(':checked');
...@@ -967,6 +962,7 @@ ...@@ -967,6 +962,7 @@
* @constructor * @constructor
*/ */
$.fn.Doodle = function(options) { $.fn.Doodle = function(options) {
moment.locale('fr')
let config = initializeConfig(); let config = initializeConfig();
this.each(function() { this.each(function() {
......
package.json
...@@ -8,7 +8,9 @@ ...@@ -8,7 +8,9 @@
"url": "https://gitlab.appolo.fr/Arnaud/doodleV2/" "url": "https://gitlab.appolo.fr/Arnaud/doodleV2/"
}, },
"license": "MIT", "license": "MIT",
"dependencies": {}, "dependencies": {
"dayjs": "^1.8.14"
},
"devDependencies": { "devDependencies": {
"tether": "^1.4.3", "tether": "^1.4.3",
"bootstrap": "4.0.0-alpha.6", "bootstrap": "4.0.0-alpha.6",
......
test/index.html
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
<link rel="stylesheet" href="/node_modules/bootstrap/dist/css/bootstrap.css"> <link rel="stylesheet" href="/node_modules/bootstrap/dist/css/bootstrap.css">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="css/starter-template.css" rel="stylesheet"> <link href="/doodleV2/test/css/starter-template.css" rel="stylesheet">
<link href="../dist/css/doodle.css" rel="stylesheet"> <link href="/doodleV2/dist/css/doodle.css" rel="stylesheet">
<!-- Pages css --> <!-- Pages css -->
<link rel="stylesheet" href="/node_modules/font-awesome/css/font-awesome.min.css"> <link rel="stylesheet" href="/doodleV2/node_modules/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="/node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker3.min.css"> <link rel="stylesheet" href="/doodleV2/node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker3.min.css">
<link rel="stylesheet" href="/node_modules/bootstrap-timepicker/css/bootstrap-timepicker.min.css"> <link rel="stylesheet" href="/doodleV2/node_modules/bootstrap-timepicker/css/bootstrap-timepicker.min.css">
</head> </head>
<body> <body>
...@@ -23,14 +23,13 @@ ...@@ -23,14 +23,13 @@
<!-- Example row of columns --> <!-- Example row of columns -->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="doodle table-responsive"></div> <div class="doodle table-responsive" data-json='{"29/07/2019":["11","12:15","13"],"30/07/2019":["11","12:15","13"],"31/07/2019":["11","12:15","13"],"01/08/2019":["13","12:15","11"],"02/08/2019":["11","12:15","13"]}' ></div>
<input type="hidden" id="inputVal" value='{}'> <input type="hidden" id="inputVal" value=''>
<!--<div class="doodle table-responsive" data-json="json/data.json"></div> <!--<div class="doodle table-responsive" data-json="json/data.json"></div>
<input type="hidden" id="inputVal" value='' />--> <input type="hidden" id="inputVal" value='' />-->
</div> </div>
</div> </div>
<hr> <hr>
<footer> <footer>
...@@ -39,19 +38,19 @@ ...@@ -39,19 +38,19 @@
</div> <!-- /container --> </div> <!-- /container -->
<!-- Jquery --> <!-- Jquery -->
<script src="/node_modules/jquery/dist/jquery.js"></script> <script src="/doodleV2/node_modules/jquery/dist/jquery.js"></script>
<script src="/node_modules/tether/dist/js/tether.js"></script> <script src="/doodleV2/node_modules/tether/dist/js/tether.js"></script>
<!-- Bootstrap / Boostrap datepicker / Bootstrap timepicker --> <!-- Bootstrap / Boostrap datepicker / Bootstrap timepicker -->
<script src="/node_modules/bootstrap/dist/js/bootstrap.js"></script> <script src="/doodleV2/node_modules/bootstrap/dist/js/bootstrap.js"></script>
<script src="/node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script> <script src="/doodleV2/node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script>
<script src="/node_modules/bootstrap-datepicker/dist/locales/bootstrap-datepicker.fr.min.js"></script> <script src="/doodleV2/node_modules/bootstrap-datepicker/dist/locales/bootstrap-datepicker.fr.min.js"></script>
<script src="/node_modules/bootstrap-timepicker/js/bootstrap-timepicker.min.js"></script> <script src="/doodleV2/node_modules/bootstrap-timepicker/js/bootstrap-timepicker.min.js"></script>
<!-- Moment --> <!-- Moment -->
<script src="/node_modules/moment/min/moment.min.js"></script> <script src="/doodleV2/node_modules/moment/min/moment.min.js"></script>
<script src="/node_modules/moment/locale/fr.js"></script> <script src="/doodleV2/node_modules/moment/min/moment-with-locales.js"></script>
<script src="../dist/js/doodle.js" type="text/javascript"></script> <script src="/doodleV2/dist/js/doodle.js" type="text/javascript"></script>
<script src="js/app.js" type="text/javascript"></script> <script src="/doodleV2/test/js/app.js" type="text/javascript"></script>
</body></html> </body></html>
test/js/app.js
$( document ).ready(function() { $( document ).ready(function() {
$('.doodle').Doodle({ $('.doodle').Doodle({
editMode: false, editMode: false,
vertical: true,
inputSelector: '#inputVal' inputSelector: '#inputVal'
}); });
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment