uniba-swt / swtbahn-cli

A client-server command line interface for the SWTbahn.
GNU General Public License v3.0
7 stars 3 forks source link

Merge Verify engine models into Master #98

Closed BLuedtke closed 1 year ago

BLuedtke commented 1 year ago

Closes Issue #62

Adds capability to let a verifier-server (swtbahn-verifier) verify an engine model to be uploaded.

Will be marked ready-to-review once sufficient testing has been performed.

BLuedtke commented 1 year ago

Tested on SWTbahn-Full with swtbahn-verifier running on our hardware as usual. Worked well for both 'good' and 'bad' engine models.

BLuedtke commented 1 year ago

To discuss: This PR would add the "admin.html" webpage/view. If I recall correctly, such a page existed in the past. Currently, client.html seems to be used for performing admin-like tasks. The verification setting should thus also (or rather) be integrated into client.html as well. However, client.html has a broken CSS/JS setup as far as I can see, so that would have to be fixed first, before the bootstrap-toggle style setting tool for the verification can be added.

BLuedtke commented 1 year ago

@eyip002 Any opinion on the "how to get verification to work" documentation added in https://github.com/uniba-swt/swtbahn-cli/pull/98/commits/01115fc6b9a4381c9bc41fd09cdd42b6f8d7d76d ?

eyip002 commented 1 year ago

@eyip002 Any opinion on the "how to get verification to work" documentation added in 01115fc ?

You can check my changes to the readme

BLuedtke commented 1 year ago

@eyip002 Any opinion on the "how to get verification to work" documentation added in 01115fc ?

You can check my changes to the readme

Reworked readme portion looks good to me.

BLuedtke commented 1 year ago

The change in post parameter for the "set" functionality was not reflected in the admin html page. This is now fixed.

eyip002 commented 1 year ago

To discuss: This PR would add the "admin.html" webpage/view. If I recall correctly, such a page existed in the past. Currently, client.html seems to be used for performing admin-like tasks. The verification setting should thus also (or rather) be integrated into client.html as well. However, client.html has a broken CSS/JS setup as far as I can see, so that would have to be fixed first, before the bootstrap-toggle style setting tool for the verification can be added.

What is the broken CSS/JS setup?

BLuedtke commented 1 year ago

What is the broken CSS/JS setup?

I have to check if it is still up to date. But the CSS/styling of the client.html page used to not show correctly. It has bootstrap linked in the header and uses its classes (iirc), but is shown in the browser as if it had no styling. I'll check whether this is still the case. Might have been fixed when we changed how jquery & bootstrap are served

BLuedtke commented 1 year ago

Current state tested on SWTbahn-Full with verifier running on the computebox. Works nicely.

Next: Will tackle moving the admin portion to client.html, and adding the field to client.html where one can configure the verifier url.

BLuedtke commented 1 year ago

tested implementation in client.html. Desired features are implemented and work via client.html and driver.html, respectively.

BLuedtke commented 1 year ago

Will now attempt to resolve merge conflicts.

BLuedtke commented 1 year ago

UI looks like this:

Failing to set either due to offline server: __verif_set_fail_both

Successfully setting URL: __verif_set_success

The success message when enabling/disabling the verification toggle: __verif_setopt_success

__verif_setopt2_success