From aa7f82002011676f0bbd10a6313e4413c9e9422b Mon Sep 17 00:00:00 2001
From: kantrol <kantrol@vodafonemail.de>
Date: Sun, 17 Dec 2017 22:44:49 +0100
Subject: [PATCH] multiple journals per day

---
 journal-entry/info.json         |  4 ++--
 journal-entry/journal-entry.qml | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/journal-entry/info.json b/journal-entry/info.json
index b9bdf11..381de34 100644
--- a/journal-entry/info.json
+++ b/journal-entry/info.json
@@ -2,8 +2,8 @@
   "name": "Journal entry",
   "identifier": "journal-entry",
   "script": "journal-entry.qml",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "minAppVersion": "17.11.6",
-  "authors": ["@pbek", "@sanderboom"],
+  "authors": ["@pbek", "@sanderboom", "@kantrol"],
   "description" : "This script creates a menu item and a button to create or jump to the current date's journal entry."
 }
diff --git a/journal-entry/journal-entry.qml b/journal-entry/journal-entry.qml
index 56ca920..e04e92a 100644
--- a/journal-entry/journal-entry.qml
+++ b/journal-entry/journal-entry.qml
@@ -7,6 +7,7 @@ import com.qownnotes.noteapi 1.0
 QtObject {
      property string defaultFolder;
      property string defaultTags;
+     property bool singleJournalPerDay;
 
      property variant settingsVariables: [
         {
@@ -23,13 +24,23 @@ QtObject {
             "type": "string",
             "default": "journal",
         },
+         {
+            "identifier": "singleJournalPerDay",
+            "name": "Single journal per day",
+            "description": "Creates a single journal per day instead of always adding a new journal.",
+            "type": "boolean",
+            "default": "true",
+        },
     ];
 
     /**
      * Initializes the custom action
      */
     function init() {
-        script.registerCustomAction("journalEntry", "Create or open a journal entry", "Journal", "document-new");
+		if (singleJournalPerDay)
+			script.registerCustomAction("journalEntry", "Create or open a journal entry", "Journal", "document-new");
+        else
+			script.registerCustomAction("journalEntry", "Create a journal entry", "Journal", "document-new");        
     }
 
     /**
@@ -46,6 +57,11 @@ QtObject {
         // get the date headline
         var m = new Date();
         var headline = "Journal " + m.getFullYear() + ("0" + (m.getMonth()+1)).slice(-2) + ("0" + m.getDate()).slice(-2);
+        
+        // when the configuration option "singleJournalPerDay" is selected create journal entries including time
+        if (!singleJournalPerDay) {
+			headline = headline + "T"+ ("0" + m.getHours()).slice(-2) + ("0" + m.getMinutes()).slice(-2) + ("0" + m.getSeconds()).slice(-2)
+		}
 
         var fileName = headline + ".md";