From 834c6de183d01128724f8f07d3ce65a7341ee32f Mon Sep 17 00:00:00 2001
From: Dennis Kerschus <denker@rm.dk>
Date: Wed, 14 Jun 2023 11:18:04 +0200
Subject: [PATCH] https://git.kerschus.dk/dennis/FlowAnalyser.git

---
 FlowAnalyserMain.py                          |  15 +++++---
 __pycache__/FlowAnalyserMain.cpython-311.pyc | Bin 2314 -> 2946 bytes
 __pycache__/sysjobs.cpython-311.pyc          | Bin 13360 -> 13360 bytes
 sysjobs.py                                   |   2 +-
 templates/index2.html                        |  38 ++++++++++++++++++-
 5 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/FlowAnalyserMain.py b/FlowAnalyserMain.py
index 42f6d52..f35ba0e 100644
--- a/FlowAnalyserMain.py
+++ b/FlowAnalyserMain.py
@@ -32,17 +32,20 @@ def create_app(test_config=None):
         return FlowTest.test()
     @FlowAnalyserMain.route('/test')
     def test():
+        html=''
         return render_template('index.html', test=html)
+    
     @FlowAnalyserMain.route('/test2')
-    def test():
-        return render_template('index2.html', test2=data2)
+    def test2():
+        with Session(engine) as session:
+            sysjobs=(Sysjobs.getNattensKoersel(session))
+            data2=json.dumps([str(b) for b in sysjobs])
+            
+            return render_template('index2.html', test2=sysjobs)
     if __name__ == '__main__':
         FlowAnalyserMain.run()
     return FlowAnalyserMain
 
 engine=inn.getEngine("msdb")
-with Session(engine) as session:
-    sysjobs=(Sysjobs.getNattensKoersel(session))
-    html=''
-    data2=[b for b in sysjobs]
+
 FlowAnalyserMain=create_app()
diff --git a/__pycache__/FlowAnalyserMain.cpython-311.pyc b/__pycache__/FlowAnalyserMain.cpython-311.pyc
index c6bc12f23307ef49ab7e57605aab458b6d8d612c..10a42680bdc705fa0ac826ec8f0401648a862244 100644
GIT binary patch
delta 1384
zcmZuxPiPZa82{ePyiA%jO`9|oZ7Nx{rBgI(3N@}+X>>(T%Su7$!frQaVy(7moHt9g
zB%~_^qx4{XN)=qlsfyjhf|ot&VOhK-B_KOcD2O)?5qF_1d)V(y(ljH!nfJZ#|9s!?
zeaYRxtv!QJeLfH1`r*f--tPi<D}<dTH<*vhurheF%d>{^`i>F4>)@wJg1mpRM6MH_
zm-ddftr2v<U0=Fq37jE$#gule0J`^@Eg9W8Qu1&jb@Mg3!%ZMZ#zAX;@s*q)6NBi#
z3OdPy*-VU~QVxEV*D!p&nGj=?Z!B2wOlS1;jp!9~c19ycJI3Qd?ZZ-pmWf0W{+FT^
z_93?jTRwkL+4S#!l>6;a*&na?<5hpW?2a29XkKuAX{MPuoI<|25Ge@a{`en~RYz&9
z9XjzC0c=8P=75sS|0LZ!Bz1P?iRo@JQ2w(NDv%{a;_FW!bf(Nprf)Y6Q6ZnAl9F@~
zj}t2b<8TmSz?6CEhCBiDgunz4d~~!Rjwu3#-NXVtyWPXctilxJ;QKDDx#dQ3#97&j
zv>X@*LsX{`OJ=5_NtP5nYLQD!Tv;Sy`0@DHb8=>ynW?$i?5Tw#DI=XU)04?;HhOZV
zFqcZsuv1YReUuyGuKy6mv;9aGq1<<@{yyvaB~|+3@#QC%o2vRPdhMwgZj6OR?W~$=
zspDzJrsp!2E1j8|&ZJRslU<#=#4KJ^g9YU(LmSn9n$5EM5XqLx8X+ocxKcf7CWo2$
zy+j&~8Dg{+_BuLhZD>Fg|A$@tJ74$1i+3iMCu^XzB}hr#429o>q8p*;v%-8O6t9Nj
z#dDj1p4FlILyaz{@T~M5t0E1=tATj&?7QHB(&+DMIXG4cj#YzWwKkEfp0SmFu)p!Q
zO<VP!=f@IcdwcuyHfMGgz+N6E{E3+SDyAex)K|v|QXZk#3FY^x=Cu)FVw58MCGGLV
zkZZ%uM)(%3oRjGB8X)-~gR8$v57i{0af7Sp4ei~ay^qdUDC+xb5~bqPf(qY(rtY71
zaCh?8t~12Xed-=f!{mlnkON38Z~eB0#b1Es$|f^<l37w#H)8yP8dQz2@I1<&t9{-R
z$cou!kAZKfsnG!vu7Q($OTg{Doxhd8cd?>|t7>@Bwbj*oZ{JGzLAVT^_17M~{{h>&
BIRO9w

delta 808
zcmZ8e&ui0Q82-LAKbmxD*4nwL*^k3o+RG-wh#(Y-ilVSfrITK2Ts~&UOuHnY6G!V1
zES^>(*yB$1Fu~#Q;;nyytrRRdDm{7W&_j>DY1Vc1O};13`@YZn<ja@6>9^td2T>Fd
z#KU++QyGMQxydltQ}Rc~)%eb(AQ9^rp+i_+te~t!CJ#dPHjdmQ(s(n=QiyPy;h~tY
z|Mf3uKKH6qU<u0$jP!v0jky?sVWAGS!(j(yBh}9->ImDvY56#WAK;*MHinSK+n=Zv
zEF5>K6wWQd)O%!|?G*a>y!s<G{@OH3_*P#Cd0ivVm!4Qpw-VTx0FMM^z@Z?Ac58+R
z)CdCDB|0%T1*D9+(p>H3m&K-}v?Qf1DNVoPNs|6;Oxs8PMAW1~xd35EKpbJ+AgV=j
zYO!c6K!Jy4vNp}PW-xQThX77|h>f<H#U2Gomy>K+xQVCiN5XVz2Gm9Xz~RgtbF=W+
zbOIi^=I+s9i>j`vrb89AfxF|&>$<~l5bL(Sk=KdC67R{SiD~8wI`|Ap`qVH4>Q&XU
zh;H655W^%}4hN;X;LjQE4>jiPuflBLDp2=`&3SD96xK_#Sni>5NFsmW&F<drex}9A
zZB8z;9cH4uR>{1|z0UOzg=00YBSwCRvF~E+;8{ytZi~z1I~`uGTxs)iZLP&e+kCWq
ztH*$LFff1<cl56dqgrM}N37rPkCJnYMPYgWa#emOH_@bbo9?GIm{>~jH558^gKH!)
F;6GIez@GpB

diff --git a/__pycache__/sysjobs.cpython-311.pyc b/__pycache__/sysjobs.cpython-311.pyc
index db1897f58b2234076b1c8eb98773ef496261341d..b3dd630eb24d58da6395111c7717af7e4610bf12 100644
GIT binary patch
delta 175
zcmdmxu_1$ZIWI340}w<PcBE8n<ee)tSw={B^IoA$=6XNYK-RAe48g3?tY1J>BI`#G
zl?>q}vwjEha#%k>s1FPbxvZrSC1nsLWgwm(YXyi0qJS#PSSmn*WlWVIK@bJx2~>eN
dKoV%8fHNCV8Ib%4be4cC8%V-+^LnvHSpY2SEyw@>

delta 173
zcmdmxu_1$ZIWI340}y=n=twEw$U9evk!AC0p=#!OU)BKDuM7-9tWm6AKvV+jM-Y_+
z;U%$t2l295KS8Ju3=BD}B@iX05GAD`o-b=ThzFv8D$7{PL4svW6(B(n1>^}-f;d1D
bXrh1<8&DaL{0MZEfD0Q)!e#S%u|`<{-a#!!

diff --git a/sysjobs.py b/sysjobs.py
index 171b4c0..1efb471 100644
--- a/sysjobs.py
+++ b/sysjobs.py
@@ -60,7 +60,7 @@ class Sysjobs(Base):
     def getNattensKoersel(session) -> List['Sysjobs']:
         natStat=(datetime.today()-timedelta(days=1)).replace(hour=20,minute=0,second=0,microsecond=0) 
         resReturn: List['Sysjobs'] = list()
-        stmt = Select(Sysjobs,Sysjobhistory).join(DataflowManagement_JobListe).join(Sysjobhistory).where(Sysjobhistory.step_id==0).where(DataflowManagement_JobListe.Aktiv==1).where(or_(and_(Sysjobhistory.run_date>=int((natStat.strftime('%Y%m%d'))),(Sysjobhistory.run_time>=int((natStat.strftime('%H%M%S'))))),Sysjobhistory.run_date>int((datetime.today().strftime('%Y%m%d'))))).distinct()
+        stmt = Select(Sysjobs,Sysjobhistory).join(DataflowManagement_JobListe).join(Sysjobhistory).where(Sysjobhistory.step_id==0).where(DataflowManagement_JobListe.Aktiv==1).where(or_(and_(Sysjobhistory.run_date>=int((natStat.strftime('%Y%m%d'))),(Sysjobhistory.run_time>=int((natStat.strftime('%H%M%S'))))),Sysjobhistory.run_date>=int((datetime.today().strftime('%Y%m%d'))))).distinct()
         row : Sysjobs
         res = session.execute(stmt).all()
      #   resReturn=[x[0] for x in res]
diff --git a/templates/index2.html b/templates/index2.html
index c8dfbb8..5ba0583 100644
--- a/templates/index2.html
+++ b/templates/index2.html
@@ -3,12 +3,46 @@
 <head>
 <title>Gantt Chart Example 1</title>
 <link type="text/css" href="http://mbostock.github.io/d3/style.css" rel="stylesheet" />
-<link type="text/css" href="example.css" rel="stylesheet" />
+<link type="text/css" href="{{ url_for('static', filename= 'css/style.css') }}" rel="stylesheet" />
 </head>
 <body>
        <a id="forkme_banner" href="http://dk8996.github.io/Gantt-Chart/" target="_blank">View on GitHub</a>
        <script type="text/javascript" src="http://d3js.org/d3.v3.min.js"></script>
 	<script type="text/javascript" src="http://static.mentful.com/gantt-chart-d3v2.js"></script>
-	<script </script>
+	<script>var tasks = [];
+        {% for b in test2 %}
+            tasks.push({"startDate":new Date("{{ b[1].getStartTime() }}"),"endDate":new Date("{{ b[1].getEndTime() }}"),"taskName":"{{ b[0].name }}","status":"SUCCEEDED"})
+        {% endfor %}
+        
+        
+        var taskStatus = {
+            "SUCCEEDED" : "bar",
+            "FAILED" : "bar-failed",
+            "RUNNING" : "bar-running",
+            "KILLED" : "bar-killed"
+        };
+        
+        var taskNames = [ "D Job", "P Job", "E Job", "A Job", "N Job" ];
+
+        taskNames=[]
+        {% for a in test2 %}
+            taskNames.push("{{ a[0].name }}" )
+        {% endfor %}
+        
+
+        tasks.sort(function(a, b) {
+            return a.endDate - b.endDate;
+        });
+        var maxDate = tasks[tasks.length - 1].endDate;
+        tasks.sort(function(a, b) {
+            return a.startDate - b.startDate;
+        });
+        var minDate = tasks[0].startDate;
+        
+        var format = "%H:%M";
+        
+        var gantt = d3.gantt().taskTypes(taskNames).taskStatus(taskStatus).tickFormat(format);
+        gantt(tasks);
+         </script>
 </body>
 </html>
\ No newline at end of file