Domoticz

git fetch
root@DiskStation:/volume1/web/dashboard# git checkout chartjs
error: pathspec 'chartjs' did not match any file(s) known to git

renerene wrote: ↑Saturday 24 August 2019 12:09 Working, Looks great!

git fetch: no problem (was already on dashticz 3)
first, my graphs were gone, with the initial custom.js .

But after I removed the declarations like

Code: Select all

blocks['graph_428'] = {
   title: 'Gas',
   width: 6,
};

.. the graphs were back, with no data

After modifying to

Code: Select all

/*	zonnepaneel	Growatt*/
blocks['graph_1354'] = {
    type: 'bar',
    datasetColors: ['yellow']
};



/*	P1 power gas*/
blocks['graph_428'] = {
    type: 'bar',
    datasetColors: ['yellow']
};

/*	P1 power stroom*/
blocks['graph_427'] = {
    width:6
    title: 'My Power',
    graph: ['line','bar','bar'],
    custom : {
        "last day": {
            range: 'day',
            filter: '8 hours',
            data: {
                nett: 'd.v+d.v2-d.r1-d.r2',
                usage: 'd.v+d.v2',
                generation: '-d.r1-d.r2'
            }
        },
        "last 2 weeks": {
            range: 'month',
            filter: '14 days',
            data: {
                nett: 'd.v+d.v2-d.r1-d.r2',
                usage: 'd.v+d.v2',
                generation: '-d.r1-d.r2'
            }
        },
        "last 6 months": {
            range: 'year',
            filter: '6 months',
            data: {
                nett: 'd.v+d.v2-d.r1-d.r2',
                usage: 'd.v+d.v2',
                generation: '-d.r1-d.r2'
            }
        }
    },
    legend: true,
    datasetColors:['blue','red','yellow']
}
 

result:


Now time for fine tune, looking for a way to change size... let's see....

git pull

EdwinK wrote: ↑Saturday 24 August 2019 11:49

git fetch
root@DiskStation:/volume1/web/dashboard# git checkout chartjs
error: pathspec 'chartjs' did not match any file(s) known to git

#go to your dashticz folder
cd dashticz
git remote -v

origin	http://github.com/Dashticz/dashticz (fetch)
origin	http://github.com/Dashticz/dashticz (push)

root@DiskStation:/volume1/web/dashboard# git remote -v
origin https://github.com/dashticzv3/dashticz_v3 (fetch)
origin https://github.com/dashticzv3/dashticz_v3 (push)

renerene wrote: ↑Saturday 24 August 2019 13:53 thank you for correcting width option.
How can I allign the height? Both graphics have width=6 in screenshot:

EdwinK wrote: ↑Saturday 24 August 2019 13:35 Aaah.. I see now.

root@DiskStation:/volume1/web/dashboard# git remote -v
origin https://github.com/dashticzv3/dashticz_v3 (fetch)
origin https://github.com/dashticzv3/dashticz_v3 (push)

git remote set-url origin https://github.com/Dashticz/dashticz.git

git remote -v

git fetch origin
git checkout chartjs

Can you show how you defined your graphs? Did you use different width parameters?

/*	P1 power gas*/
blocks['graph_428'] = {
    type: 'line',
    datasetColors: ['white'],
    width:6
};

/*	P1 power stroom*/
blocks['graph_427'] = {
    width: 6,
    title: 'My Power',
    graph: ['line','bar','bar'],
    custom : {
        "last day": {
            range: '8 hrs',
            filter: '8 hours',
            data: {
                nett: 'd.v+d.v2-d.r1-d.r2',
                usage: 'd.v+d.v2',
                generation: '-d.r1-d.r2'
            }
        },
        "last 2 weeks": {
            range: 'month',
            filter: '14 days',
            data: {
                nett: 'd.v+d.v2-d.r1-d.r2',
                usage: 'd.v+d.v2',
                generation: '-d.r1-d.r2'
            }
        },
        "last 6 months": {
            range: 'year',
            filter: '6 months',
            data: {
                nett: 'd.v+d.v2-d.r1-d.r2',
                usage: 'd.v+d.v2',
                generation: '-d.r1-d.r2'
            }
        }
    },
    legend: false,
    datasetColors:['blue','red','yellow']
}

columns[3]['blocks'] = ['graph_427','graph_428','stationclock', frames.weather,'garbage',779,781,'s2','s3','s4', 866, 941,  1352, 1342, 864, 774, 1137, 1225];

#graphoutput427 {height: 120px;}

renerene wrote:additional: regarding the total amount in the top left corder. It would be great it that would show the total of the selected time interval, not of beginning of measurement/?/year

renerene wrote: ↑Wednesday 28 August 2019 8:20 Thank you for the update. Did a quick check, the graphs have the same height now.

Furthermore:
1) when is the graph updated? Sometimes the last data is more than 10 minutes old. (never quite understood the config['domoticz_refresh'] = '5';
config['dashticz_refresh'] = '60'. Is it in seconds?)
2) is it possible to combine more devices in one graph? Would be great to build one big mother graph with temp inside, temp outside, electricity, solar, gas

Really thankful with your works uptil now. Keep it up.