Merge branch 'reminders' into development

config/Reports/reminders.xml

@@ -0,0 +1,186 @@
+<window id="remindersreport">
+	<reporttitle>Production:->Reminders</reporttitle>
+    <layout type="vertical">
+        <webview id="report" />
+    </layout>
+    <menu name="File">
+        <item id="print" shortcut="Ctrl+P">Print</item>
+    </menu>
+    <program>
+        <![CDATA[
+            var window = this;
+            this.windowTitle = "Typica - Reminders";
+            var report = findChildObject(this, 'report');
+            var printMenu = findChildObject(this, 'print');
+            printMenu.triggered.connect(function() {
+                report.print();
+            });
+            var e = new Array();
+            function populateReminderData() {
+                e = new Array();
+                var query = new QSqlQuery;
+                query.exec("SELECT id, reminder FROM reminders");
+                while(query.next())
+                {
+                    var reminder = JSON.parse(query.value(1));
+                    reminder.dbid = query.value(0);
+                    var start_time = "" + reminder.start_year + "-" + reminder.start_month + "-" + reminder.start_day + " " + reminder.start_time;
+                    if(reminder.condition == "PRODUCTIONWEIGHT")
+                    {
+                        var convert = 1;
+                        var unittext = " Lb";
+                        if(reminder.unit == "KG")
+                        {
+                            convert = 2.2;
+                            unittext = " Kg";
+                        }
+                        var dq = new QSqlQuery;
+                        dq.prepare("SELECT sum(roasted_quantity)/:conversion FROM roasting_log WHERE time > :since");
+                        dq.bind(":conversion", convert);
+                        dq.bind(":since", start_time);
+                        dq.exec();
+                        dq.next();
+                        var proportion;
+                        var remain;
+                        if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
+                        {
+                            proportion = 1;
+                        }
+                        else
+                        {
+                            proportion = Number(dq.value(0)) / reminder.value;
+                        }
+                        remain = (reminder.value - Number(dq.value(0))).toFixed(0);
+                        reminder.completion = proportion;
+                        reminder.detail = remain + unittext;
+                        dq = dq.invalidate();
+                    }
+                    else if(reminder.condition == "DAYS")
+                    {
+                        var dq = new QSqlQuery;
+                        dq.prepare("SELECT 'now'::date - :since::date");
+                        dq.bind(":since", start_time);
+                        dq.exec();
+                        dq.next();
+                        var proportion;
+                        var remain;
+                        if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
+                        {
+                            proportion = 1;
+                        }
+                        else
+                        {
+                            proportion = Number(dq.value(0)) / reminder.value;
+                        }
+                        remain = reminder.value - Number(dq.value(0));
+                        reminder.completion = proportion;
+                        reminder.detail = remain + " Days";
+                        dq = dq.invalidate();
+                    }
+                    else if(reminder.condition == "PRODUCTIONBATCHES")
+                    {
+                        var dq = new QSqlQuery;
+                        dq.prepare("SELECT count(1) FROM roasting_log WHERE time > :since");
+                        dq.bind(":since", start_time);
+                        dq.exec();
+                        dq.next();
+                        var proportion;
+                        var remain;
+                        if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
+                        {
+                            proportion = 1;
+                        }
+                        else
+                        {
+                            proportion = Number(dq.value(0)) / reminder.value;
+                        }
+                        remain = reminder.value - Number(dq.value(0));
+                        reminder.completion = proportion;
+                        reminder.detail = remain + " Batches";
+                        dq = dq.invalidate();
+                    }
+                    else if(reminder.condition == "PRODUCTIONHOURS")
+                    {
+                        var dq = new QSqlQuery;
+                        dq.prepare("SELECT extract(epoch FROM (SELECT sum(duration) FROM roasting_log WHERE time > :since) / 3600)");
+                        dq.bind(":since", start_time);
+                        dq.exec();
+                        dq.next();
+                        var proportion;
+                        var remain;
+                        if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
+                        {
+                            proportion = 1;
+                        }
+                        else
+                        {
+                            proportion = Number(dq.value(0)) / reminder.value;
+                        }
+                        remain = reminder.value - Number(dq.value(0));
+                        reminder.completion = proportion;
+                        reminder.detail = remain.toFixed(1) + " Hours";
+                        dq = dq.invalidate();
+                    }
+                    e[reminder.dbid] = reminder;
+                }
+                query = query.invalidate();
+            }
+            function refresh() {
+                populateReminderData();
+                var passedData = e.filter(function(n){return n.hasOwnProperty("completion")}).sort(function(a,b){return b.completion-a.completion});
+                var buffer = new QBuffer;
+                buffer.open(3);
+                var output = new XmlWriter(buffer);
+                output.writeStartDocument("1.0");
+                output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
+                output.writeStartElement("html");
+                output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
+                output.writeStartElement("head");
+                output.writeTextElement("title", "Reminders");
+                output.writeEndElement();
+                output.writeStartElement("body");
+                output.writeTextElement("h1", "Reminders");
+                output.writeStartElement("a");
+                output.writeAttribute("href", "typica://script/0");
+                output.writeStartElement("div");
+                output.writeAttribute("class", "reminder");
+                output.writeStartElement("div");
+                output.writeAttribute("class", "nocolor");
+                output.writeEndElement();
+                output.writeStartElement("span");
+                output.writeAttribute("class", "title");
+                output.writeCDATA("New Reminder");
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeTextElement("script", "e = " + JSON.stringify(passedData));
+                var styleFile = new QFile(QSettings.value("config") + "/Scripts/reminders.css");
+                styleFile.open(1);
+                output.writeTextElement("style", styleFile.readToString());
+                styleFile.close();
+                output.writeStartElement("script");
+                scriptFile = new QFile(QSettings.value("config") + "/Scripts/reminders.js");
+                scriptFile.open(1);
+                output.writeCDATA(scriptFile.readToString());
+                scriptFile.close();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndDocument();
+                report.setContent(buffer);
+                buffer.close();
+            }
+            refresh();
+            var doRefresh = function() {
+                refresh();
+            }
+            report.scriptLinkClicked.connect(function(url) {
+                var reminder = createWindow("editreminder");
+                if(url != "0")
+                {
+                    reminder.loadData(e[url]);
+                }
+                reminder.setRefreshFunction(doRefresh);
+            });
+        ]]>
+    </program>
+</window>

config/Scripts/reminders.css

@@ -0,0 +1,68 @@
+body{
+    background-color: #EDE3C0;
+}
+.reminder{
+    background-color: #EEEEEE;
+    display: block;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-top: 10px;
+    max-width: 300px;
+    padding-right: 5px;
+    padding-bottom: 5px;
+}
+.green{
+    width: 150px;
+    background-color: #00FF00;
+    height: 10px;
+    display: block;
+}
+.yellow{
+    width: 150px;
+    background-color: #FFFF00;
+    height: 10px;
+    display: block;
+}
+.orange{
+    width: 150px;
+    background-color: #FFA500;
+    height: 10px;
+    display: block;
+}
+.red{
+    width: 150px;
+    background-color: #FF0000;
+    height: 10px;
+    display: block;
+}
+.nocolor{
+    height: 10px;
+    display: block;
+}
+a{
+    text-decoration: none;
+    color: #000000;
+    display: block;
+    max-width: 300px;
+}
+.reminder span{
+    margin-left: 5px;
+    display: block;
+}
+.progress{
+    float: left;
+    color: #708090;
+    font-size: 80%
+}
+.detail{
+    float: right;
+    color: #708090;
+    font-size: 80%
+}
+.clearfix{
+    clear: both;
+}
+.title{
+    margin-bottom: 5px;
+    margin-top: 3px;
+}

config/Scripts/reminders.js

@@ -0,0 +1,23 @@
+e.forEach(function(item) {
+    var element = document.createElement("a");
+    element.href="typica://script/" + item.dbid
+    var colordiv;
+    if(item.completion >= 1)
+    {
+        colordiv = '<div class="red"></div>';
+    }
+    else
+    {
+        colordiv = '<div class="orange"></div>';
+    }
+    if(item.completion < 0.6)
+    {
+        colordiv = '<div class="yellow"></div>';
+    }
+    if(item.completion < 0.3)
+    {
+        colordiv = '<div class="green"></div>';
+    }
+    element.innerHTML = '<div class="reminder">' + colordiv + '<span class="title">' + item.title + '</span><span class="progress">' + Math.floor(item.completion * 100) + '%</span><span class="detail">' + item.detail + '</span><div class="clearfix"></div></div>';
+    document.body.appendChild(element);
+})

config/Windows/editreminder.xml

@@ -0,0 +1,206 @@
+<window id="editreminder">
+    <layout type="vertical">
+        <layout type="horizontal">
+            <label>Name:</label>
+            <line id="name" />
+        </layout>
+        <label>Description:</label>
+        <textarea id="description" />
+        <layout type="horizontal">
+            <label>Since:</label>
+            <calendar time="true" id="since" />
+            <button name="Now" id="now" type="push" />
+        </layout>
+        <layout type="horizontal">
+            <label>Condition:</label>
+            <sqldrop id="condition" />
+        </layout>
+        <layout type="stack" id="conditionvars">
+            <page>
+                <layout type="horizontal">
+                    <line id="productionweight" validator="numeric" />
+                    <sqldrop id="productionunit" />
+                </layout>
+            </page>
+            <page>
+                <layout type="horizontal">
+                    <line id="days" validator="numeric" />
+                </layout>
+            </page>
+            <page>
+                <layout type="horizontal">
+                    <line id="batches" validator="numeric" />
+                </layout>
+            </page>
+            <page>
+                <layout type="horizontal">
+                    <line id="roastingtime" validator="numeric" />
+                </layout>
+            </page>
+        </layout>
+        <layout type="horizontal">
+            <button name="Delete" id="delete" type="push" />
+            <button name="Save" id="save" type="push" />
+        </layout>
+    </layout>
+    <program>
+        <![CDATA[
+            var window = this;
+            window.setRefreshFunction = function(callback) {
+                window.refreshCallback = callback;
+            }
+            window.currentReminder = new Object();
+            this.windowTitle = "Typica - Edit Reminder";
+            var unitBox = findChildObject(this, 'productionunit');
+            unitBox.addItem("Kg");
+            unitBox.addItem("Lb");
+            unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+            var condition = findChildObject(this, 'condition');
+            condition.addItem("Roasted Coffee Production");
+            condition.addItem("Days");
+            condition.addItem("Batches Roasted");
+            condition.addItem("Hours of Roasting Time");
+            var conditionpage = findChildObject(this, 'conditionvars');
+            condition['currentIndexChanged(int)'].connect(function(c) {
+                conditionpage.setCurrentIndex(c);
+            });
+            var namefield = findChildObject(this, 'name');
+            var descfield = findChildObject(this, 'description');
+            var sincefield = findChildObject(this, 'since');
+            var prodweight = findChildObject(this, 'productionweight');
+            var daysfield = findChildObject(this, 'days');
+            var batchesfield = findChildObject(this, 'batches');
+            var hoursfield = findChildObject(this, 'roastingtime');
+            var time = new QTime();
+            var deleteButton = findChildObject(this, 'delete');
+            deleteButton.enabled = false;
+            deleteButton.clicked.connect(function() {
+                var query = new QSqlQuery;
+                query.prepare("DELETE FROM reminders WHERE id = :id");
+                query.bind("id", window.currentReminder.dbid);
+                query.exec();
+                query = query.invalidate();
+                window.refreshCallback();
+                window.close();
+            });
+            var saveButton = findChildObject(this, 'save');
+            saveButton.clicked.connect(function() {
+                r = new Object();
+                r.title = namefield.text;
+                r.description = descfield.plainText;
+                r.start_year = sincefield.year();
+                r.start_month = sincefield.month();
+                r.start_day = sincefield.day();
+                r.start_time = sincefield.time.toString("hh:mm:ss");
+                switch(condition.currentIndex)
+                {
+                    case 0:
+                        r.condition = "PRODUCTIONWEIGHT";
+                        r.value = Number(prodweight.text);
+                        if(unitBox.currentIndex == 0)
+                        {
+                            r.unit = "KG";
+                        }
+                        else
+                        {
+                            r.unit = "LB";
+                        }
+                        break;
+                    case 1:
+                        r.condition = "DAYS";
+                        r.value = daysfield.text;
+                        break;
+                    case 2:
+                        r.condition = "PRODUCTIONBATCHES";
+                        r.value = batchesfield.text;
+                        break;
+                    case 3:
+                        r.condition = "PRODUCTIONHOURS";
+                        r.value = hoursfield.text;
+                        break;
+                }
+                var query = new QSqlQuery;
+                if(window.currentReminder.hasOwnProperty("dbid"))
+                {
+                    query.prepare("UPDATE reminders SET reminder = :reminder WHERE id = :id");
+                    query.bind("reminder", JSON.stringify(r));
+                    query.bind("id", window.currentReminder.dbid);
+                }
+                else
+                {
+                    query.prepare("INSERT INTO reminders (id, reminder) VALUES(default, :reminder)");
+                    query.bind("reminder", JSON.stringify(r));
+                }
+                query.exec();
+                query = query.invalidate();
+                window.refreshCallback();
+                window.close();
+            });
+            window.loadData = function(reminder) {
+                window.currentReminder = reminder;
+                deleteButton.enabled = reminder.hasOwnProperty("dbid");
+                if(reminder.hasOwnProperty("title"))
+                {
+                    namefield.text = reminder.title;
+                }
+                if(reminder.hasOwnProperty("description"))
+                {
+                    descfield.plainText = reminder.description;
+                }
+                if(reminder.hasOwnProperty("start_year") &&
+                   reminder.hasOwnProperty("start_month") &&
+                   reminder.hasOwnProperty("start_day"))
+                {
+                    sincefield.setDate(reminder.start_year, reminder.start_month, reminder.start_day);
+                }
+                if(reminder.hasOwnProperty("start_time"))
+                {
+                    sincefield.time = time.fromString(reminder.start_time, "hh:mm:ss");
+                }
+                if(reminder.hasOwnProperty("condition"))
+                {
+                    if(reminder.condition == "PRODUCTIONWEIGHT")
+                    {
+                        condition.setCurrentIndex(0);
+                        if(reminder.hasOwnProperty("value"))
+                        {
+                            prodweight.text = reminder.value;
+                        }
+                        if(reminder.unit == "KG")
+                        {
+                            unitBox.setCurrentIndex(0);
+                        }
+                        else
+                        {
+                            unitBox.setCurrentIndex(1);
+                        }
+                    }
+                    else if(reminder.condition == "DAYS")
+                    {
+                        condition.setCurrentIndex(1);
+                        if(reminder.hasOwnProperty("value"))
+                        {
+                            daysfield.text = reminder.value;
+                        }
+                    }
+                    else if(reminder.condition == "PRODUCTIONBATCHES")
+                    {
+                        condition.setCurrentIndex(2);
+                        if(reminder.hasOwnProperty("value"))
+                        {
+                            batchesfield.text = reminder.value;
+                        }
+                    }
+                    else if(reminder.condition == "PRODUCTIONHOURS")
+                    {
+                        condition.setCurrentIndex(3);
+                        if(reminder.hasOwnProperty("value"))
+                        {
+                            hoursfield.text = reminder.value;
+                        }
+                    }
+                }
+            }
+        ]]>
+    </program>
+</window>

config/Windows/navigation.xml

@@ -293,6 +293,12 @@ type="push" />
 			query.exec("CREATE OR REPLACE FUNCTION log_use() RETURNS trigger AS $$ DECLARE i integer := array_lower(NEW.unroasted_id, 1); u integer := array_upper(NEW.unroasted_id, 1); BEGIN IF NEW.transaction_type = 'ROAST' THEN WHILE i <= u LOOP INSERT INTO use (time, item, quantity) VALUES(NEW.time, NEW.unroasted_id[i], NEW.unroasted_quantity[i]); i := i + 1; END LOOP; END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("UPDATE TypicaFeatures SET version = 4 WHERE feature = 'base-features'");
 		};
+                var DBUpdateReminders = function() {
+                    var query = new QSqlQuery;
+                    query.exec("CREATE TABLE IF NOT EXISTS reminders (id bigserial PRIMARY KEY NOT NULL, reminder text NOT NULL)");
+                    query.exec("UPDATE TypicaFeatures SET version = 5 WHERE feature = 'base-features'");
+                    query = query.invalidate();
+                };
 		
 		query = new QSqlQuery();
 		/* A table keeps track of database versioning information. This table is created
@@ -321,6 +327,10 @@ type="push" />
 			{
 				DBUpdateTriggers();
 			}
+                        if(query.value(2) < 5)
+                        {
+                            DBUpdateReminders();
+                        }
 		}
 		else
 		{

config/config.xml

@@ -23,27 +23,28 @@
     <include src="Windows/cuppingsessionsummary.xml" />
     <include src="Windows/cuppingsummary.xml" />
     <include src="Windows/purchase.xml" />
-	<include src="Windows/invoicelist.xml" />
-	<include src="Windows/invoiceinfo.xml" />
-	<include src="Windows/editinvoice.xml" />
-	<include src="Windows/editinvoiceitem.xml" />
-	<include src="Windows/editfee.xml" />
-	<include src="Windows/optime.xml" />
-	<include src="Windows/greensales.xml" />
-	<include src="Windows/profilehistory.xml" />
-	<include src="Windows/editbatchdetails.xml" />
-	<include src="Windows/newsamplebatch.xml" />
-	<program>
-		<![CDATA[
-		Windows = new Object();
-		var loggingWindow;
-		var currentBatchInfo;
-		var navwindow = createWindow("navwindow");
-		var aadapt;
-		var badapt;
-		var azero;
-		var bzero;
-		navwindow.windowTitle = "Typica - Choose Your Path";
-		]]>
-	</program>
+    <include src="Windows/invoicelist.xml" />
+    <include src="Windows/invoiceinfo.xml" />
+    <include src="Windows/editinvoice.xml" />
+    <include src="Windows/editinvoiceitem.xml" />
+    <include src="Windows/editfee.xml" />
+    <include src="Windows/optime.xml" />
+    <include src="Windows/greensales.xml" />
+    <include src="Windows/profilehistory.xml" />
+    <include src="Windows/editbatchdetails.xml" />
+    <include src="Windows/newsamplebatch.xml" />
+    <include src="Windows/editreminder.xml" />
+    <program>
+        <![CDATA[
+            Windows = new Object();
+            var loggingWindow;
+            var currentBatchInfo;
+            var navwindow = createWindow("navwindow");
+            var aadapt;
+            var badapt;
+            var azero;
+            var bzero;
+            navwindow.windowTitle = "Typica - Choose Your Path";
+        ]]>
+    </program>
 </application>