Skip to content

Propagate changes from fork to parent repo#39

Merged
brichards64 merged 10 commits intoToolDAQ:masterfrom
ekumachidi:ce-consolidation
Dec 9, 2024
Merged

Propagate changes from fork to parent repo#39
brichards64 merged 10 commits intoToolDAQ:masterfrom
ekumachidi:ce-consolidation

Conversation

@ekumachidi
Copy link
Contributor

No description provided.

@marc1uk
Copy link
Contributor

marc1uk commented Dec 4, 2024

  • Can you add in the file html-Detector/stylesheets/material.min.js.map from WCTE branch, this fixes some console errors. I would copy it into html-Common and add symlinks in html-Standalone and html-Detector.

  • Please remove the emacs backup file html-Detector/#login.html#

  • I would probably keep the capitalized of L in html-StandAlone/Logs.

  • We can probably move the stylesheets directories to html-Common

  • We can probably migrate the Config pages to html-Common as they're duplicates?

  • We can probably remove html-Detector/Testing

  • We can probably remove html-Detector/Config/test

  • One for @brichards64 but do we need both SubSystemTemplate and SubSystemExample?

  • I think the monitoringplots folder needed to be in an html directory to be accessible (at least with our current apache configuration), so I would keep it there. This would need to update /cgi-bin/monitoringplots.cgi as well. I'm not sure if @brichards64 wants to add symlinks in html-Detector and/or html-Standalone.

  • Please remove (or comment out) ServiceSend.setsockopt(ZMQ_IMMEDIATE, b); in cgi-bin/sendcommand2nopadding.cpp as that turned out to be a mistake. It causes the socket to hang if there's no listener, which is the opposite of what we want.

  • maybe also copy over the extra debugging line from cgi-bin/sqlquery.cgi from wcte. Small change but nice to have.

  • I believe this isn't used and is probably going to be removed, but the changes in html-Common/Monitoring/plots.js are needed to prevent errors.

  • I would keep the wcte changes in html-Common/SQL/sql.js.

  • The changes in html-Common/includes/functions.js need to be migrated.

  • I think the last 3 lines added in html-Detector/includes/drawer.html are superfluous and cause issues.

  • This is probably moot as it'll be replaced with evgenii's changes, but we should make sure we keep track of things like exporting PGHOST and PGUSER in scripts such as cgi-bin/get_event.cgi and cgi-bin/pmt-locations.cgi. Your version hard-codes localhost, the wcte version checks for those variables and overrides with a WCTE-specific IP address. Neither is really great, and we shouldn't lose track of these.

Think that's all the changes I can spot.

* Remove the emacs backup file html-Detector/#login.html#
* Move stylesheets directory to html-Common
* Remove html-Detector/Testing
* Remove html-Detector/Config/test
…mmand2nopadding.cpp` as that turned out to be a mistake
@brichards64
Copy link
Contributor

alarms folder should be a sym link to alarms in common. Please check changes are propagated to common

@brichards64
Copy link
Contributor

remove testing folder

@brichards64
Copy link
Contributor

please change to tooldaq logo favicon

@brichards64
Copy link
Contributor

remove wcte specific subsystem pages

command=${post[command]}
# TODO make an argument?
PGHOST=127.0.0.1
PGHOST=192.168.10.17
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be loop back

@@ -0,0 +1 @@
sure go for it
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need?

@ekumachidi
Copy link
Contributor Author

remove wcte specific subsystem pages

Already addressed

@ekumachidi
Copy link
Contributor Author

ekumachidi commented Dec 9, 2024

remove wcte specific subsystem pages

Already addressed in an old commit

@brichards64
Copy link
Contributor

style sheets folder needs sym linking not individual files. logs folder in standalone is lowercase L

@brichards64
Copy link
Contributor

brichards64 commented Dec 9, 2024

  1. We can probably migrate the Config pages to html-Common as they're duplicates?
  2. I think the last 3 lines added in html-Detector/includes/drawer.html are superfluous and cause issues.

@brichards64 brichards64 merged commit 4422d33 into ToolDAQ:master Dec 9, 2024
@ekumachidi ekumachidi deleted the ce-consolidation branch December 11, 2024 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants