Merge pull request #15 from DataCloud-project/development

Development
DataCloud-project · Oct 8, 2023 · d55cd9e · d55cd9e
2 parents b22db30 + 09f9aa9
commit d55cd9e
Show file tree

Hide file tree

Showing 40 changed files with 598,815 additions and 344 deletions.
diff --git a/api/backend_api/__pycache__/backend_classes.cpython-38.pyc b/api/backend_api/__pycache__/backend_classes.cpython-38.pyc
diff --git a/api/backend_api/__pycache__/conformance_app.cpython-38.pyc b/api/backend_api/__pycache__/conformance_app.cpython-38.pyc
diff --git a/api/backend_api/__pycache__/creategraph_app.cpython-38.pyc b/api/backend_api/__pycache__/creategraph_app.cpython-38.pyc
diff --git a/api/backend_api/__pycache__/durFreq_app.cpython-38.pyc b/api/backend_api/__pycache__/durFreq_app.cpython-38.pyc
diff --git a/api/backend_api/__pycache__/filter_app.cpython-38.pyc b/api/backend_api/__pycache__/filter_app.cpython-38.pyc
diff --git a/api/backend_api/__pycache__/query_app.cpython-38.pyc b/api/backend_api/__pycache__/query_app.cpython-38.pyc
diff --git a/api/backend_api/__pycache__/rule_app.cpython-38.pyc b/api/backend_api/__pycache__/rule_app.cpython-38.pyc
diff --git a/api/backend_api/__pycache__/segmentator_app.cpython-38.pyc b/api/backend_api/__pycache__/segmentator_app.cpython-38.pyc
diff --git a/api/backend_api/__pycache__/start_app.cpython-38.pyc b/api/backend_api/__pycache__/start_app.cpython-38.pyc
diff --git a/api/client_secrets.json b/api/client_secrets.json
@@ -0,0 +1,16 @@
+{
+    "web": {
+        "issuer": "https://datacloud-auth.euprojects.net/auth/realms/user-authentication",
+        "auth_uri": "https://datacloud-auth.euprojects.net/auth/realms/user-authentication/protocol/openid-connect/auth",
+        "client_id": "uro_client",
+        "realm_name" : "user-authentication",
+        "server_url" : "https://datacloud-auth.euprojects.net/auth/",
+        "client_secret": "e17f32ff-159d-4fd8-bb0c-8588668dfb5f",
+        "redirect_uris": [
+            "https://datacloud-auth.euprojects.net/*"
+        ],
+        "userinfo_uri": "https://datacloud-auth.euprojects.net/auth/realms/user-authentication/protocol/openid-connect/userinfo", 
+        "token_uri": "https://datacloud-auth.euprojects.net/auth/realms/user-authentication/protocol/openid-connect/token",
+        "token_introspection_uri": "https://datacloud-auth.euprojects.net/auth/realms/user-authentication/protocol/openid-connect/token/introspect"
+    }
+}
diff --git a/api/database/__pycache__/databaseFunctions.cpython-38.pyc b/api/database/__pycache__/databaseFunctions.cpython-38.pyc
diff --git a/api/dsl_to_xes/__pycache__/classes.cpython-38.pyc b/api/dsl_to_xes/__pycache__/classes.cpython-38.pyc
diff --git a/api/dsl_to_xes/__pycache__/utils.cpython-38.pyc b/api/dsl_to_xes/__pycache__/utils.cpython-38.pyc
diff --git a/api/flask_session/2029240f6d1128be89ddc32729463129 b/api/flask_session/2029240f6d1128be89ddc32729463129
diff --git a/api/flask_session/84e27218256f101dabff86174c8f129b b/api/flask_session/84e27218256f101dabff86174c8f129b
diff --git a/api/flask_session/98c1b208e3507ce3427ebc3f2018fc6d b/api/flask_session/98c1b208e3507ce3427ebc3f2018fc6d
diff --git a/api/flask_session/tmp5nxd1krd.__wz_cache b/api/flask_session/tmp5nxd1krd.__wz_cache
diff --git a/api/flask_session/tmpgnndegbo.__wz_cache b/api/flask_session/tmpgnndegbo.__wz_cache
diff --git a/api/key/ca_bundle.crt b/api/key/ca_bundle.crt
@@ -0,0 +1,39 @@
+-----BEGIN CERTIFICATE-----
+MIIG1TCCBL2gAwIBAgIQbFWr29AHksedBwzYEZ7WvzANBgkqhkiG9w0BAQwFADCB
+iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
+cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
+BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMjAw
+MTMwMDAwMDAwWhcNMzAwMTI5MjM1OTU5WjBLMQswCQYDVQQGEwJBVDEQMA4GA1UE
+ChMHWmVyb1NTTDEqMCgGA1UEAxMhWmVyb1NTTCBSU0EgRG9tYWluIFNlY3VyZSBT
+aXRlIENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAhmlzfqO1Mdgj
+4W3dpBPTVBX1AuvcAyG1fl0dUnw/MeueCWzRWTheZ35LVo91kLI3DDVaZKW+TBAs
+JBjEbYmMwcWSTWYCg5334SF0+ctDAsFxsX+rTDh9kSrG/4mp6OShubLaEIUJiZo4
+t873TuSd0Wj5DWt3DtpAG8T35l/v+xrN8ub8PSSoX5Vkgw+jWf4KQtNvUFLDq8mF
+WhUnPL6jHAADXpvs4lTNYwOtx9yQtbpxwSt7QJY1+ICrmRJB6BuKRt/jfDJF9Jsc
+RQVlHIxQdKAJl7oaVnXgDkqtk2qddd3kCDXd74gv813G91z7CjsGyJ93oJIlNS3U
+gFbD6V54JMgZ3rSmotYbz98oZxX7MKbtCm1aJ/q+hTv2YK1yMxrnfcieKmOYBbFD
+hnW5O6RMA703dBK92j6XRN2EttLkQuujZgy+jXRKtaWMIlkNkWJmOiHmErQngHvt
+iNkIcjJumq1ddFX4iaTI40a6zgvIBtxFeDs2RfcaH73er7ctNUUqgQT5rFgJhMmF
+x76rQgB5OZUkodb5k2ex7P+Gu4J86bS15094UuYcV09hVeknmTh5Ex9CBKipLS2W
+2wKBakf+aVYnNCU6S0nASqt2xrZpGC1v7v6DhuepyyJtn3qSV2PoBiU5Sql+aARp
+wUibQMGm44gjyNDqDlVp+ShLQlUH9x8CAwEAAaOCAXUwggFxMB8GA1UdIwQYMBaA
+FFN5v1qqK0rPVIDh2JvAnfKyA2bLMB0GA1UdDgQWBBTI2XhootkZaNU9ct5fCj7c
+tYaGpjAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUE
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
+TjAIBgZngQwBAgEwUAYDVR0fBEkwRzBFoEOgQYY/aHR0cDovL2NybC51c2VydHJ1
+c3QuY29tL1VTRVJUcnVzdFJTQUNlcnRpZmljYXRpb25BdXRob3JpdHkuY3JsMHYG
+CCsGAQUFBwEBBGowaDA/BggrBgEFBQcwAoYzaHR0cDovL2NydC51c2VydHJ1c3Qu
+Y29tL1VTRVJUcnVzdFJTQUFkZFRydXN0Q0EuY3J0MCUGCCsGAQUFBzABhhlodHRw
+Oi8vb2NzcC51c2VydHJ1c3QuY29tMA0GCSqGSIb3DQEBDAUAA4ICAQAVDwoIzQDV
+ercT0eYqZjBNJ8VNWwVFlQOtZERqn5iWnEVaLZZdzxlbvz2Fx0ExUNuUEgYkIVM4
+YocKkCQ7hO5noicoq/DrEYH5IuNcuW1I8JJZ9DLuB1fYvIHlZ2JG46iNbVKA3ygA
+Ez86RvDQlt2C494qqPVItRjrz9YlJEGT0DrttyApq0YLFDzf+Z1pkMhh7c+7fXeJ
+qmIhfJpduKc8HEQkYQQShen426S3H0JrIAbKcBCiyYFuOhfyvuwVCFDfFvrjADjd
+4jX1uQXd161IyFRbm89s2Oj5oU1wDYz5sx+hoCuh6lSs+/uPuWomIq3y1GDFNafW
++LsHBU16lQo5Q2yh25laQsKRgyPmMpHJ98edm6y2sHUabASmRHxvGiuwwE25aDU0
+2SAeepyImJ2CzB80YG7WxlynHqNhpE7xfC7PzQlLgmfEHdU+tHFeQazRQnrFkW2W
+kqRGIq7cKRnyypvjPMkjeiV9lRdAM9fSJvsB3svUuu1coIG1xxI1yegoGM4r5QP4
+RGIVvYaiI76C0djoSbQ/dkIUUXQuB8AL5jyH34g3BZaaXyvpmnV4ilppMXVAnAYG
+ON51WhJ6W0xNdNJwzYASZYH+tmCWI+N60Gv2NNMGHwMZ7e9bXgzUCZH5FaBFDGR5
+S9VWqHB73Q+OyIVvIbKYcSc2w/aSuFKGSA==
+-----END CERTIFICATE-----
diff --git a/api/key/certificate.crt b/api/key/certificate.crt
@@ -0,0 +1,37 @@
+-----BEGIN CERTIFICATE-----
+MIIGYjCCBEqgAwIBAgIRAO4Ux7g3HDCJtZQ+yEJenVYwDQYJKoZIhvcNAQEMBQAw
+SzELMAkGA1UEBhMCQVQxEDAOBgNVBAoTB1plcm9TU0wxKjAoBgNVBAMTIVplcm9T
+U0wgUlNBIERvbWFpbiBTZWN1cmUgU2l0ZSBDQTAeFw0yMzAzMTAwMDAwMDBaFw0y
+MzA2MDgyMzU5NTlaMBkxFzAVBgNVBAMTDjE5NS4yMzEuNjEuMTk2MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt8aCnKDP55052PWnJIOOQoIuoZ20WDVN
+brs8UsjG81AtHi5FntamAHzPOL/oizrNE2FzSVoC1zs0ai4/oI5B9njiOhkIOfNQ
+mgOtOKbRPprCgUUR2bzV4x6/fXMRy0Aao/v7aCph3EMllNIbD8hSRGR93p3JVLGa
+3m4gyEQjl+xb/DVbli9nRMJ6LGIAW1aOSSnjI0ZlEMAG/0qYYYSCS4J+Dc76FDTH
+FlWAg/waYICFSEdKoLzb48mhRjNfszPnfe2wP3k312ffNkZhFVNNtFJ4uj2N8ukh
+dM7kBZ/U97ByrjNCdOoO6nHm59bBxJ6B2w3kdd96mvKTr6LgL944LwIDAQABo4IC
+cTCCAm0wHwYDVR0jBBgwFoAUyNl4aKLZGWjVPXLeXwo+3LWGhqYwHQYDVR0OBBYE
+FMQjTsgpLstWdkLzhxaxK1Du64jnMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQG
+CysGAQQBsjEBAgJOMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20v
+Q1BTMAgGBmeBDAECATCBiAYIKwYBBQUHAQEEfDB6MEsGCCsGAQUFBzAChj9odHRw
+Oi8vemVyb3NzbC5jcnQuc2VjdGlnby5jb20vWmVyb1NTTFJTQURvbWFpblNlY3Vy
+ZVNpdGVDQS5jcnQwKwYIKwYBBQUHMAGGH2h0dHA6Ly96ZXJvc3NsLm9jc3Auc2Vj
+dGlnby5jb20wggEFBgorBgEEAdZ5AgQCBIH2BIHzAPEAdgCt9776fP8QyIudPZwe
+PhhqtGcpXc+xDCTKhYY069yCigAAAYbNCH/nAAAEAwBHMEUCIEztNFhQ0V+AcyV6
+cGxoiGNDu1EfdVTsdrDJ88caIsbjAiEApIz5JNdRngK9IW6HRMDDeKKWZT9d9Rrg
+YN5JKeVlH+cAdwB6MoxU2LcttiDqOOBSHumEFnAyE4VNO9IrwTpXo1LrUgAAAYbN
+CIBDAAAEAwBIMEYCIQCBpBbt4al3M93gD9LjtneNhhA3nUgCvPzewldSAHlnKwIh
+ANcDIvJ4M0kukYIqoX9uC29ZoA2CqsQ/hpMcD+p5piA9MA8GA1UdEQQIMAaHBMPn
+PcQwDQYJKoZIhvcNAQEMBQADggIBAFlbGizJ9dhcmFZ9QxlTeMafVyaAv1NUz/Px
+lrRyOOTHMYqnPXJzLn8MKSe6nmTzN0MXvEWBlF7EvH5YyzItNZXQ4Wx+Q9DSHetx
+H2R5P0GVhazgpgtVd3jRBtfxSg1EIr7kmxaANokqzydYgfSU4Dtx3hiA7iEzTkV2
+pY+lG4jhowtr3cJPXXScKF+vRvI+U4PxNrM7sGloIPsn8SWqVj/h1xeqFovwBjSB
++euB8zo+SbKKOcFM9aIGaXZeatUQeS8+rhhqDNHXSdk5SFJguw+TJT1wW+0vB0Lr
+374QsqoeZHzmTTHeuh1G/1INUiq03I9IFNqh6VyU+9PpdSzHWe/ArVbYVVD8nF/P
+MMnJGQEnYNTjSebyAU33JaiqnIrCES2JCRYyMcKxWQTsXqH/ckOPfCLczKE34WH2
+z5MpAL/ihJTnezVGNRsLO4y5VAAlfu110+hEB1oROHZWR9HaBpliDO9SX627lsSj
+nDEeT/Km1ziGK9hamGF3W9QyDxKqi+lVja1aATtMNu92L3Bn5MgTXZJfF0BrnCCk
+kqN1OsH6kOu1ezmotIwns2sbHS9jP8iY6XpAJ2ELJdp0gwLbEaIWax3egfUngL1g
+nWP0zKsWHQ8xlZRpwdkcRbvf8rgPTFHut1MESUGVjmq9tv99HpoD4axuSiKyCRRq
+EeyuARVo
+-----END CERTIFICATE-----
diff --git a/api/key/localhost/localhost.crt b/api/key/localhost/localhost.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDajCCAlKgAwIBAgIUfFdmfMMyyptjHltZSB23bKe3920wDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCSVQxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMjExMDkxNzA4MDNaFw0zMjEx
+MDYxNzA4MDNaMEAxCzAJBgNVBAYTAklUMQ4wDAYDVQQIDAVJdGFseTEhMB8GA1UE
+CgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAzU07r7eVKCWzIhl4OlqN5ltmKCml0wLVVcRQcsTJ4gEhEVxQ
+IocgfuXk18vyf2VyvBX5UAq8jVKJENTBlAch4ydrJbIoSbpd4+SXwy+jVk8kps+a
+lIJEW1jZb78a4uS88k46sl5oTFHhuI8/pdfrEw41hYqgyMv7ogUThPJxZ/m2dTQp
+GCEAJMKvANa/jmFQFSZ63fnNjcUpZQcSq0pl35m61QYMhkBBaPrg6eBPD7jan9AW
+/Dw783qwDqKP8kkHKtHgGw00aFrQjAmrU0cCP4eBDvkFQ6nkvFKMEMjiSiJTzM/6
+bfsMSePYvjU4IJqWaaSTTT50NLcp5wxEi9g19QIDAQABo1cwVTAfBgNVHSMEGDAW
+gBTYkTTZ9E2olBduSGNAqHBLH+VIfjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DAa
+BgNVHREEEzARgglsb2NhbGhvc3SHBH8AAAEwDQYJKoZIhvcNAQELBQADggEBACrJ
+0AXRWCliPGX6uA/dXPAlNUXhuk3bl1IwHMQdnevf+mmVKmhKB9mLwtdmTfRpcdfN
+WOtFpdHD4BPfvZcBiNBg4Ql740GjHsr3+IjoQv/Jm+Sxo7Z7NJVX07RBKkuT887B
+bxY91qvmvzgx7o1AMTBdPItTCAWvrPZVSu0xXtNqWe8EuhsKxca2tPAe7TRdFCz/
+fQjLiGaF9R1wz1GGGkmGDgtSjQ3w95BikbOtktFPa7BH7OemGHDbrH1VGQGJbW9W
+z84T+wIPVW0DEwtGgUawhd7vter3RQ1x/XLHRWewCOPNzBcNsVjoXZOxBKDaAEEG
+kyxAR6f6GdU8Nj+FL/I=
+-----END CERTIFICATE-----
diff --git a/api/key/localhost/localhost.csr b/api/key/localhost/localhost.csr
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIChTCCAW0CAQAwQDELMAkGA1UEBhMCSVQxDjAMBgNVBAgMBUl0YWx5MSEwHwYD
+VQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDNTTuvt5UoJbMiGXg6Wo3mW2YoKaXTAtVVxFByxMniASER
+XFAihyB+5eTXy/J/ZXK8FflQCryNUokQ1MGUByHjJ2slsihJul3j5JfDL6NWTySm
+z5qUgkRbWNlvvxri5LzyTjqyXmhMUeG4jz+l1+sTDjWFiqDIy/uiBROE8nFn+bZ1
+NCkYIQAkwq8A1r+OYVAVJnrd+c2NxSllBxKrSmXfmbrVBgyGQEFo+uDp4E8PuNqf
+0Bb8PDvzerAOoo/ySQcq0eAbDTRoWtCMCatTRwI/h4EO+QVDqeS8UowQyOJKIlPM
+z/pt+wxJ49i+NTggmpZppJNNPnQ0tynnDESL2DX1AgMBAAGgADANBgkqhkiG9w0B
+AQsFAAOCAQEAXTTJKiORGlfUS4EnOp5Juf8fzQ6JBbmSCStYwykcVMgy8DfoPL2d
+fpmwcYCCDKEGge0xtYuvUPVCC/qbmWDGsFsiiiMZvvYP3cIUayL0tiQz+YFDt+Ff
+YzQN5PvwBlQvunHgp3xGqT/aYhPI2G79UdKK2vpQKSFWYTfyDeqxySpfxsTTJ+jb
+VcbseIHWD6n7wAl7vNW25xSMtI8B02Gy9sv4fE+cAnX9NtISpMBCnSQOwAEVwZ3Z
+ifGnoOmEXhiay9/NWjYjJ5BHDlxrGnmBMfWfjANh1bEvOocYnMQtnGDSl6lIktX6
+6Za+Cd9df8oB7ObVKxrl7mbw3WoCct/9Kw==
+-----END CERTIFICATE REQUEST-----
diff --git a/api/key/localhost/localhost.ext b/api/key/localhost/localhost.ext
@@ -0,0 +1,8 @@
+authorityKeyIdentifier = keyid,issuer
+basicConstraints = CA:FALSE
+keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
+subjectAltName = @alt_names
+
+[alt_names]
+DNS.1 = localhost
+IP.1 = 127.0.0.1
diff --git a/api/key/localhost/localhost.key b/api/key/localhost/localhost.key
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,84D900345F2FC232
+
+Zx0Du6dHS0OvDdhniEB9ZV1zQuPMSb5xG7paTR3vbQeP4klKSdmgWtzP0FGAS3tI
+27B6A3ClFbkCcxrgyXENhT9z7nZqVc0TWPIj7Ts6kF+IguUVvbCCzLtRSa1LhhpI
+jsEPQbkKthL9UjfbPAsHxzqhprQ2hRLAq0REddSbjZ06GQ2q9vzwf9nbgsuCcyyF
+bbRPNvhvZK1iFj6I6oLScWZ1qJwSkrFBtxjvfJIaTkWwNeOuCAD/Aep+6MXPuiR2
+Mov9BOEIc+dbM7UVk4E6DkHk7U3ZyvpTgRMbTKA8ZHCLeSaknqN59CgWC8ozKcnU
+Ftb2aNKQGvdXWexcmgxJb9esGlzngkzge24qqDFkFqKGZjCDGrpPem+mUrWlWZU1
+JZHCjyPGcMgmbis6JLKsYp1T9Ff4CKNz9ms+To6x4KOx5zcxoNs8j5fe7h/wsWt2
+N3sBk1P4empfhsaBwaPMKkeWsxODb1LdcCFYqWbwW+2Tu8jEBI1ZtWbWQxt44jfQ
+AchcnFoxW1LwTMiBHzU8h+zyXdOihnVRKPE9tF8lf0tpHzNO9OlL9z75oTkK51Sc
+e9B53wQtoPFDgvjhX6yi+PZrT6O/b/lspieV366m9m+reox9ipKO1TkNKj3hXqi/
+bBZC0tvhwqSpjF7NvqUC21KS0ewzEOnjefZ/O4HR0CNLq3DfOXXO07dsMMbDs843
+aUeTAkA1e20+V2vyGVsbI5Ry3H96XLPLce/OjSVxHpbTQHSkYK4Q7D829x9iT3La
+40b99pC4jPLYwAhitpAWU6SWV0G0Wvqja74/tpvkWpFLgVYOUAyujYpRC0uHfO2H
+UJ+ak0jXDK9uFqRcCl9F+6QekXXR4TeC393aU8+91HgWvtjXEm9jHvry3MOfKpth
+QxoVdp7/7ln/UwOMoho3VtpyZTKoIcLPoSUCLUL5MtjWlN52HOgsYm7Ww062FkRt
+g1Virb0BRFGKMfUmzd2iNdbjB4vZb4fVoQ/LDASYgL5CxLrmCyzGT1eAjrN90Q20
+erXe8ponnsga2OweAocDkQWXEwxGGYhI2GgMcxK6UeTxZ8zcRYLNQt4th748zrQN
+ygv/SgkAAKCNEVDDlaOaG3zWHzuct/fthDBIQfYECT9qmjF3KSNkJBR+PbBg+bJj
+eYqcyH//pd+GKjXHeYZ7wQkfcEBW1QmlYRgsL0PBG/j7OrFQ2d/IkBQEHZpOcB2M
+Ia3CaL22j9FrLn4hiFqnfya6XquEEZUsr7GMpSiznCGqgYWtbjYCQZokiI1W96mH
+jR63XyC5cLMIbGeDnDVRtE2k7lZe//bmOz6X00xadkt7ru3A5Cq8boMgD5KtbXU1
+UIUEGpSaNUtKNWmhDEoyZH3IHk/pSP4YLIOuJvag36RYJJ4FT5IUyuNOtIBL28Go
+UR5OGx07Hf91TAMlP131Ks8nuw8Z3KjEDD29J1IFFnJaH3/mIvIw2A+Y8JxdX4iS
+Nr0K9Afj8QtHujtIqWCG5C3WC2WhmGz/PPrWMcbw4exmSVwu5jJw2tRYyIUk+9C4
+ZOLXtgGOGxMIDW7VtUWhIQvlXS1y0gmnR1Va4khqH4rajnbnt8OFXg==
+-----END RSA PRIVATE KEY-----
diff --git a/api/key/localhost/localhostd.key b/api/key/localhost/localhostd.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAzU07r7eVKCWzIhl4OlqN5ltmKCml0wLVVcRQcsTJ4gEhEVxQ
+IocgfuXk18vyf2VyvBX5UAq8jVKJENTBlAch4ydrJbIoSbpd4+SXwy+jVk8kps+a
+lIJEW1jZb78a4uS88k46sl5oTFHhuI8/pdfrEw41hYqgyMv7ogUThPJxZ/m2dTQp
+GCEAJMKvANa/jmFQFSZ63fnNjcUpZQcSq0pl35m61QYMhkBBaPrg6eBPD7jan9AW
+/Dw783qwDqKP8kkHKtHgGw00aFrQjAmrU0cCP4eBDvkFQ6nkvFKMEMjiSiJTzM/6
+bfsMSePYvjU4IJqWaaSTTT50NLcp5wxEi9g19QIDAQABAoIBAGF7AJIoqywK6omQ
+amPax3HPiCwdylztBXrZ4hD8m5cyTg8+M9aRLr7STdyhPB19gAMKs/xrfKflvqs9
+OkUdNdvzxY56j2KimR4yVlUZc4bxwUdrX8yQJgDxqRzEMvH1BjpPJtO2u/MxFepa
+KjCG21mK76Le9gUhxfNiUahYrbxeHay0q4rNRi5zvTmdtR+2tKiSY+ZFnqp583w6
+WGa/xskFBG1kY7bEOUF5rpqeDzCqDgLnl8CR1Ej8gnBOqNSrhMqsbccIesaQPgpd
+My+8rVyj77D5Kz95AKFOBg94QknoJ6Z+NfOM1w2SQ8fn0Q9uMq5TksJj8QYODq3P
+/5oFdEECgYEA5Z+mfufI1dIDffoNdBh2Ppfixj+zvjvgidDV8dD689fD0fHqWcnb
+IxqjvsRJO0EmqdvGDT5eooRInq9P6zvT3CzgivtTq7KpzHyAqwA3YgcE/Jcsrh2h
+5jCakTCzVluIvnjkEcK4eG/bROf2lGgMMH0QVXKx9XdKyIUvBacixO0CgYEA5OJe
+KViImKmjb+aQDAVLoX8MnYdO/IND0ti0pwWluz38VUu+6GXRM4RdrmTdZrXMXVBf
+1nA1Y2C+LJRow5XC/1bY7aLGVh+DEp32gMTrndcxcsXhIsWUKSycsFhbS4PlNQ2V
+fc4zZwdq+YjZycBLpTdoUXun3LB/m8bd4C/X3CkCgYBdmh3Jn3xbxPdNdA/l4k7Z
+Jxr3C2KeylO2eh2sLC8QFUUqoL2SClm8zpAvJF5hvCYhmYf7QBBdmSTtIrOmRUYQ
+e26w2NB7riHPTHU6v6TT3d6nhIxfEY88gVWQl9STAE8WrbryjniaB6bPSOtYBa3q
+WiC9ZDqswAsJAFlxqXbf5QKBgQDPtaYh+1gqwnexSxkZ74xNCJEYO/ywJydbppF6
+qSNXos7lURH0sMGC8PJbGunZFc5aOGBgp/+rKdYrepsAM158fgHq1bcL3RkDwho7
+jXkNCoazU2QWPBtSqkuftO9UvmM5HBS30HLRYufvgAO0lS+QxZGDsKYLHpkPcw9T
+LdfE0QKBgHqRo2y4/dxVWdEBH62ffqug3J2UXSNn/wzLXE4Muy3h2ExC7trylYfR
+bbewLUXx6uw0JWw4hhIijAnAPKPY3iYZLREwLDPKROZcFwIVRzu320CqC4InM7NR
+IuPwK2rIga3qisEit+5vb4IObWY6IOp9mCvgCVtc371ZmeKOU9tj
+-----END RSA PRIVATE KEY-----
diff --git a/api/key/private.key b/api/key/private.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAt8aCnKDP55052PWnJIOOQoIuoZ20WDVNbrs8UsjG81AtHi5F
+ntamAHzPOL/oizrNE2FzSVoC1zs0ai4/oI5B9njiOhkIOfNQmgOtOKbRPprCgUUR
+2bzV4x6/fXMRy0Aao/v7aCph3EMllNIbD8hSRGR93p3JVLGa3m4gyEQjl+xb/DVb
+li9nRMJ6LGIAW1aOSSnjI0ZlEMAG/0qYYYSCS4J+Dc76FDTHFlWAg/waYICFSEdK
+oLzb48mhRjNfszPnfe2wP3k312ffNkZhFVNNtFJ4uj2N8ukhdM7kBZ/U97ByrjNC
+dOoO6nHm59bBxJ6B2w3kdd96mvKTr6LgL944LwIDAQABAoIBACUF7fxF/XyI1UWb
+P8AAbOGDPoe6sMFwg5gCSoXXAxWzmlNROR9l2O2SN2EUcHHUN8pmwIYPhzD7MXUO
+uizLXAiek9zmfBzIov1ULkqSeOcm4HaQhqcZ/vERmbxZOUV8NaHBuwViPHLWaDTS
+GzeTwNccc6ssmIniefPDtgECkTUixkv251F5R9SgjbeCI0wbCBJhrBU+PzhuxJuc
+Pj3A9Rj+17cQvK/BhN++r4giYtUsq4w0SdwUQ6kASDHeQGl9ZrKc2aPM9Yn/AS9W
+RjSuHr+CwgTpzMU4lPdlQ/ioalcgEAn4ptEZ9eDsujNqYuCXM604wLWnn7U3siwX
+2rIkuhkCgYEA6NUp1EvFFHHTFpyLvgYW04us1dImOAZy282Mp16G72V41bll5Hpu
+StGS0g8lzQbo/WiKm1i65CoX+VMEcQ8issiyyPYOvbeClPwlKUp9YSTEdScdUZlr
+5cnEjxkqARHn04BqIr+oQF6SYHbxNK6a1ls7MWCl0qLN82CMo5GTGQUCgYEAyg+8
+JGqIPFV6Nhea80bz1duu1dhXhikmgVWsdHkHt6l8QVqMVuAsu82P6hA1AFLpg9ze
+3gC/rg8z8y2sQr0BejMilYcj/VCmWRebhD8C6zrj5jmvfeLCn+Sfbhy2m7I9DYEv
+nvxX6Ulp2P+1ZrbtMTiAASgaqiTd7KZM61taQqMCgYA2m8BazYaku+mhdQgFgpIZ
+/bmE0Owr2b9YtEYX/0Cwp2EG55vxUZHKtIq1/92Cz+sXfEx+EPqMhx7mWEVDayRd
+QFtGbQeaEY9r+BOTMqhjf2cgfxMOT2iSFZenZGSIqbVw0r6R9de1eTjlrR/3ljg0
+rGMeuqdJ1uts+KkjuAIDLQKBgAcR195aT9v0jasY1lYOtHdWEV7wC9fo1q0Nx1Pn
+7Coz5uIOffyIKWiEv7VLzd7uB7eSYcXYttwrMgEfJvjKziNtaJdcvBif2sIhPlK5
+NavvSowClq5L4c1gXWen34fBC7vOOlFQuO6zn910zO8EFXZ0aJ4hvhUX5x/hja1q
+a9ULAoGBAImhrQm4Z0W+0HFEDdbeZp2wqSo12gbvgw5IZxxg3z4CZsfeDarzdtUN
+qcCTQ0MCQGIDYvtmnlXOhskpNZGXY6OVy1TDkGDFlsDpakaK5kNHU0q9wQo558jA
+pmiH2a8+ZfHTMi1WsDxq5B7BSh6nNcfjN3sKIoRSUTGxujZb2ccb
+-----END RSA PRIVATE KEY-----
diff --git a/api/rule_filter/__pycache__/rule.cpython-38.pyc b/api/rule_filter/__pycache__/rule.cpython-38.pyc
diff --git a/api/rule_filter/__pycache__/utilities.cpython-38.pyc b/api/rule_filter/__pycache__/utilities.cpython-38.pyc
diff --git a/api/static/scripts/generalScript.js b/api/static/scripts/generalScript.js
@@ -226,8 +226,8 @@ function getGraphText(selector){
 	// then remove from the array the first 3 and last 2 elements which are useless
 	var graphText = graphText.split('\n\t').splice(3);
 	graphText.pop();
-	graphText.pop();
-
+	if ( selector != 'frequency' )
+		graphText.pop();
 	return graphText;
 }
 
@@ -282,7 +282,7 @@ function getCombinedNodes(graphNodesF, graphNodesP){
 }
 
 function getGraphEdges(graphText, boolFreq){
-	//obtain the array of edges with parameter
+	//obtain the array of edges with parameters
 	var graphEdges = [];
 	var j = 0;
 	// cycle throguh the graph array 
@@ -307,7 +307,7 @@ function getGraphEdges(graphText, boolFreq){
 				graphEdges[j][2] = '';
 			}
 			j++;
-		}	
+		}
 	}
 
 	return graphEdges;
@@ -346,14 +346,38 @@ function getDslSteps(graphNodes, graphEdges){
 		dslSteps[i].push([graphNodes[i][1], graphNodes[i][2], graphNodes[i][3]]);
 		// then, for each edge
 		for (var j=0; j<graphEdges.length; j++){
-			// check if the current node is the successor
-			if (graphEdges[j][1] == graphNodes[i][1]){
-				// in that case save the info about the edge
-				dslSteps[i].push([graphEdges[j][0], graphEdges[j][2], graphEdges[j][3]]);
+			// check if the current node is the predecessor
+			if (graphEdges[j][0] == graphNodes[i][1]){
+				//save the info about the edge (successor name, frequency, duration)
+				dslSteps[i].push([graphEdges[j][1], graphEdges[j][2], graphEdges[j][3]]);
+			}
+		}
+	}
+	// order DSL steps
+	console.log(graphNodes);
+	console.log(graphEdges);
+	console.log(dslSteps);
+	var orderedDslSteps = [];
+	//populate start and end
+	orderedDslSteps[0] = ['start', '', ''];
+	orderedDslSteps[dslSteps.length-1] = ['end', '', ''];
+	// for each step in ordered dslSteps (except 'end')
+	for (var i=0; i<orderedDslSteps.length-1; i++){
+		// for each step in dslSteps
+		for (var j=0; j<dslSteps.length-1; j++){
+			// if the current ordered step is the current step
+			if (orderedDslSteps[i][0] == dslSteps[j][0][0]){
+				// push the successor of the step in the next ordered step
+				orderedDslSteps[i+1] = dslSteps[j][1];
+				// remove the current item from the array to reduce iterations
+				dslSteps.splice(j,1);
+				// exit from the cycle to reduce iterations
+				break;
 			}
 		}
 	}
-	return dslSteps;
+	console.log(orderedDslSteps);
+	return orderedDslSteps;
 }
 
 // Function to download data to a file