Skip to content

D
doodle
Commit cc5612fb by Arnaud
Options

Merge branch 'dev' into 'master'

Dev See merge request Arnaud/doodleV2!1
parents a17d2e0f 836edaef
Showing with 145 additions and 87 deletions
.idea/workspace.xml
......@@ -3,8 +3,9 @@
<component name="ChangeListManager">
<list default="true" id="f76cd25a-57f7-4341-ac07-d3559735dca3" name="Default" comment="add list option">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/css/doodle.css" beforeDir="false" afterPath="$PROJECT_DIR$/dist/css/doodle.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/js/doodle.js" beforeDir="false" afterPath="$PROJECT_DIR$/dist/js/doodle.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/test/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/test/js/app.js" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/node_modules/" />
......@@ -17,10 +18,19 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dist/js/doodle.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="224" selection-start-line="224" selection-end-line="224" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="3" lean-forward="true" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="3" />
<state relative-caret-position="105">
<caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
......@@ -28,8 +38,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="25" column="5" lean-forward="true" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
<state relative-caret-position="285">
<caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
</state>
</provider>
</entry>
......@@ -38,9 +48,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>date_form</find>
<find>$('input[type=checkbox]:checked')</find>
<find>border</find>
<find>.doodle-table.backend tr td:last-child</find>
<find>this.hours</find>
<find>this.days</find>
......@@ -52,16 +59,30 @@
<find>DDMMYYYY</find>
<find>addInOutputObject</find>
<find>DD/MM</find>
<find>console.log</find>
<find>.doodle-table .input-group-addon</find>
<find>moment</find>
<find>console.l</find>
<find>this.config.output</find>
<find>this.config.out</find>
<find>this.config.input</find>
<find>hour</find>
<find>createTable</find>
<find>moment.</find>
<find>DoodleBack</find>
<find>DoodleFront</find>
<find>moment</find>
<find>weekdays</find>
<find>t</find>
<find>dayjs</find>
<find>console.</find>
<find>getJsonData</find>
<find>createInputBox</find>
<find>vertical</find>
<find>console.log</find>
</findStrings>
<replaceStrings>
<replace>dayjs</replace>
<replace>moment</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
......@@ -74,19 +95,19 @@
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/assets/lib/doodle/js/doodle.js" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/dist/css/doodle.css" />
<option value="$PROJECT_DIR$/dist/js/doodle.js" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/test/index.html" />
<option value="$PROJECT_DIR$/test/js/app.js" />
<option value="$PROJECT_DIR$/dist/js/doodle.js" />
</list>
</option>
</component>
<component name="PhpServers">
<servers />
</component>
<component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
<component name="ProjectFrameBounds" fullScreen="true">
<option name="x" value="-1920" />
<option name="width" value="1920" />
<option name="height" value="1080" />
......@@ -96,22 +117,32 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="plugins" type="b2602c69:ProjectViewProjectNode" />
<item name="plugins" type="462c0819:PsiDirectoryNode" />
<item name="doodleV2" type="b2602c69:ProjectViewProjectNode" />
<item name="doodleV2" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="doodleV2" type="b2602c69:ProjectViewProjectNode" />
<item name="doodleV2" type="462c0819:PsiDirectoryNode" />
<item name="dist" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="plugins" type="b2602c69:ProjectViewProjectNode" />
<item name="plugins" type="462c0819:PsiDirectoryNode" />
<item name="doodleV2" type="b2602c69:ProjectViewProjectNode" />
<item name="doodleV2" type="462c0819:PsiDirectoryNode" />
<item name="dist" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="doodleV2" type="b2602c69:ProjectViewProjectNode" />
<item name="doodleV2" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="plugins" type="b2602c69:ProjectViewProjectNode" />
<item name="plugins" type="462c0819:PsiDirectoryNode" />
<item name="doodleV2" type="b2602c69:ProjectViewProjectNode" />
<item name="doodleV2" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
......@@ -119,11 +150,13 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_package_manager_path" value="yarn" />
</component>
<component name="RecentsManager">
......@@ -145,12 +178,16 @@
</list>
</option>
</component>
<component name="RunManager">
<component name="RunManager" selected="JavaScript Debug.index.html (1)">
<configuration name="index.html (1)" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/doodleV2/index.html" useBuiltInWebServerPort="true">
<method v="2" />
</configuration>
<configuration name="index.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/plugins/index.html" useBuiltInWebServerPort="true">
<method v="2" />
</configuration>
<recent_temporary>
<list>
<item itemvalue="JavaScript Debug.index.html (1)" />
<item itemvalue="JavaScript Debug.index.html" />
</list>
</recent_temporary>
......@@ -174,6 +211,9 @@
<workItem from="1520516425669" duration="957000" />
<workItem from="1520587991958" duration="9703000" />
<workItem from="1557237748486" duration="3856000" />
<workItem from="1559830364711" duration="1411000" />
<workItem from="1562077295102" duration="2545000" />
<workItem from="1569229297852" duration="1744000" />
</task>
<task id="LOCAL-00001" summary="Update readme">
<created>1520333212191</created>
......@@ -263,16 +303,15 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="24990000" />
<option name="totallyTimeSpent" value="30690000" />
</component>
<component name="ToolWindowManager">
<frame x="-1920" y="0" width="1920" height="1080" extended-state="6" />
<frame x="-1920" y="0" width="1920" height="1080" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1485623" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15335463" />
<window_info id="Structure" order="1" weight="0.14483494" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Database Changes" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32970297" />
......@@ -286,6 +325,7 @@
<window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.28217822" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="12" />
<window_info anchor="bottom" id="Database Changes" order="13" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
......@@ -313,13 +353,6 @@
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/node_modules/bootstrap-timepicker/js/bootstrap-timepicker.js" />
<entry file="file://$PROJECT_DIR$/test/json/data.json">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
......@@ -330,16 +363,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" column="1" lean-forward="true" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/css/starter-template.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="349">
......@@ -354,24 +377,63 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/js/doodle.js">
<entry file="file://$PROJECT_DIR$/test/json/data.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1125">
<caret line="75" column="43" selection-start-line="75" selection-start-column="43" selection-end-line="75" selection-end-column="43" />
<state relative-caret-position="120">
<caret line="8" column="1" lean-forward="true" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/index.html">
<entry file="file://$PROJECT_DIR$/node_modules/dayjs/plugin/customParseFormat.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/dayjs/dayjs.min.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/dayjs/esm/utils.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/dayjs/esm/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6144">
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="25" column="5" lean-forward="true" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
<state relative-caret-position="300">
<caret line="20" column="23" lean-forward="true" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/css/starter-template.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="1" lean-forward="true" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="3" lean-forward="true" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="3" />
<state relative-caret-position="105">
<caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/js/doodle.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="224" selection-start-line="224" selection-end-line="224" />
</state>
</provider>
</entry>
......
README.md
......@@ -13,6 +13,7 @@ npm install
| Parameters | Options | Description |
|--|--|--|
|editMode| false (default) | Enable doodle's backend|
|vertical| false (default) | Enable doodle's front vertical display|
|inputSelector| '' | jQuery selector input to attach or select json|
|defaultHours|[] (default)|Set default hours|
|outputDateFormat|''|Define output date format|
......@@ -75,4 +76,4 @@ Include all dependencies
<script src="assets/lib/doodle/js/doodle.js" type="text/javascript"></script>
<script src="js/app.js" type="text/javascript"></script>
```
\ No newline at end of file
```
dist/js/doodle.js
......@@ -19,8 +19,6 @@
this.initLoad = () => {
this.getJsonData();
console.log(this.json);
if(!this.json) {
console.warn('Invalid Json data');
return;
......@@ -42,7 +40,6 @@
* Create Table
*/
this.createTable = (config) => {
console.log(config);
$(document).on('click', 'input[type=checkbox]', this.eventInput);
if(config.vertical) {
......@@ -66,13 +63,15 @@
}
};
this.createList = function() {
this.createList = function() { // TODO : vertical
let div = $('<div>');
// DAYS =>
for(let index in this.days) {
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 date = this.days[index];
let $h3 = $('<h5><span class="date_format"><b>' + formatDateDay + '</b></span> ' + formatDateMonth + '</td>');
div.append($h3);
......@@ -85,7 +84,8 @@
} else {
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);
}
}
......@@ -108,9 +108,8 @@
for(let index in this.days) {
let $tr = $('<tr>');
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 formatDateDay = moment(this.days[index], this.dateFormat).locale('fr').format('dddd DD');
let formatDateMonth = moment(this.days[index], this.dateFormat).locale('fr').format('MMMM');
html = $tr.append('<td><span class="date_format"><b>' + formatDateDay + '</b></span> ' + formatDateMonth + '</td>')
.append(this.createBodyContent(this.days[index]));
......@@ -274,11 +273,8 @@
this.createJSON = () => {
let $input = $(this.config.inputSelector);
console.log($input);
if ($input.length > 0) {
$input.val(JSON.stringify(this.outputJson));
console.log($input.val());
}
};
......@@ -287,7 +283,6 @@
* @param e event
*/
this.eventInput = (e) => {
console.log("OUAIS");
let data = $(e.target).data('check').split('_');
let isChecked = $(e.target).is(':checked');
......@@ -967,6 +962,7 @@
* @constructor
*/
$.fn.Doodle = function(options) {
moment.locale('fr')
let config = initializeConfig();
this.each(function() {
......@@ -995,4 +991,4 @@
}
};
})(jQuery);
\ No newline at end of file
})(jQuery);
package.json
......@@ -8,7 +8,9 @@
"url": "https://gitlab.appolo.fr/Arnaud/doodleV2/"
},
"license": "MIT",
"dependencies": {},
"dependencies": {
"dayjs": "^1.8.14"
},
"devDependencies": {
"tether": "^1.4.3",
"bootstrap": "4.0.0-alpha.6",
......
test/index.html
......@@ -9,13 +9,13 @@
<link rel="stylesheet" href="/node_modules/bootstrap/dist/css/bootstrap.css">
<!-- Custom styles for this template -->
<link href="css/starter-template.css" rel="stylesheet">
<link href="../dist/css/doodle.css" rel="stylesheet">
<link href="/doodleV2/test/css/starter-template.css" rel="stylesheet">
<link href="/doodleV2/dist/css/doodle.css" rel="stylesheet">
<!-- Pages css -->
<link rel="stylesheet" href="/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="/node_modules/bootstrap-timepicker/css/bootstrap-timepicker.min.css">
<link rel="stylesheet" href="/doodleV2/node_modules/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="/doodleV2/node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker3.min.css">
<link rel="stylesheet" href="/doodleV2/node_modules/bootstrap-timepicker/css/bootstrap-timepicker.min.css">
</head>
<body>
......@@ -23,14 +23,13 @@
<!-- Example row of columns -->
<div class="row">
<div class="col-md-12">
<div class="doodle table-responsive"></div>
<input type="hidden" id="inputVal" value='{}'>
<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=''>
<!--<div class="doodle table-responsive" data-json="json/data.json"></div>
<input type="hidden" id="inputVal" value='' />-->
</div>
</div>
<hr>
<footer>
......@@ -39,19 +38,19 @@
</div> <!-- /container -->
<!-- Jquery -->
<script src="/node_modules/jquery/dist/jquery.js"></script>
<script src="/node_modules/tether/dist/js/tether.js"></script>
<script src="/doodleV2/node_modules/jquery/dist/jquery.js"></script>
<script src="/doodleV2/node_modules/tether/dist/js/tether.js"></script>
<!-- Bootstrap / Boostrap datepicker / Bootstrap timepicker -->
<script src="/node_modules/bootstrap/dist/js/bootstrap.js"></script>
<script src="/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="/node_modules/bootstrap-timepicker/js/bootstrap-timepicker.min.js"></script>
<script src="/doodleV2/node_modules/bootstrap/dist/js/bootstrap.js"></script>
<script src="/doodleV2/node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script>
<script src="/doodleV2/node_modules/bootstrap-datepicker/dist/locales/bootstrap-datepicker.fr.min.js"></script>
<script src="/doodleV2/node_modules/bootstrap-timepicker/js/bootstrap-timepicker.min.js"></script>
<!-- Moment -->
<script src="/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.min.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="js/app.js" type="text/javascript"></script>
<script src="/doodleV2/dist/js/doodle.js" type="text/javascript"></script>
<script src="/doodleV2/test/js/app.js" type="text/javascript"></script>
</body></html>
test/js/app.js
$( document ).ready(function() {
$('.doodle').Doodle({
editMode: false,
vertical: true,
inputSelector: '#inputVal'
});
});
\ No newline at end of file
});
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