Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Request merging Moodlecpd 4.1 LTS to Medicine branch #14

Merged
merged 34 commits into from
Sep 4, 2024

Conversation

ubc-tuehoang
Copy link

Request to merge the old medicine branch with the latest CPD production Moodle 4.1.10 (Build: 20240422).

  • New code to support languages
  • New code to support theme and icon designers
  • Few other bugs fixed
  • Plugin contains Arlo version 4.1.4 zip file.
  • and plugins updated to support the latest Moodle 4.1.10

@Lannro Lannro self-assigned this Sep 4, 2024
@Lannro Lannro merged commit 16408c2 into medicine Sep 4, 2024
1 check passed
@Lannro Lannro deleted the moodlecpd-4.1LTS branch September 4, 2024 17:20
Copy link
Member

@xcompass xcompass left a comment

Choose a reason for hiding this comment

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

Not urgent. Please update them when you have time. Also would be useful to follow my comments in the future development.


#This is the latest version: And pending on Kate verification with her team.
#This is the latest version of plugin moodle33 as of 11Dec2023
Copy link
Member

Choose a reason for hiding this comment

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

are those statement still valid?

&& curl -L https://moodle.org/plugins/download.php/11565/mod_certificate_moodle33_2016052300.zip -o /certificate.zip \
&& cp /certificate.zip /var/www/html/mod/ \
&& cd /var/www/html/mod \
&& unzip certificate.zip \
&& rm certificate.zip \

&& curl -L https://moodle.org/plugins/download.php/29419/mod_hvp_moodle42_2023061200.zip -o /hvp.zip \
#Updated to newer hvp 10Dec2023 and 18Apr2024
Copy link
Member

Choose a reason for hiding this comment

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

You don't need to add this kind of comment. The information can be reflect in the commit and commit message.

##FROM dangtue2020/moodlecore:419stg2-41ec0380b10f

##Version 4.1.10
##FROM dangtue2020/moodlecore:4110-2d9b62e726d4
Copy link
Member

Choose a reason for hiding this comment

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

This can be moved to commit message

#&& cp /choicegroup.zip /var/www/html/mod/ \
#&& cd /var/www/html/mod \
#&& unzip choicegroup.zip \
#&& rm choicegroup.zip \
Copy link
Member

Choose a reason for hiding this comment

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

this can be deleted and move above comment to commit message.

&& curl -L https://moodle.org/plugins/download.php/16906/block_poll_moodle37_2018052500.zip -o /poll.zip \
&& cp /poll.zip /var/www/html/blocks/ \
&& cd /var/www/html/blocks \
&& unzip poll.zip \
&& rm poll.zip \

&& curl -L https://moodle.org/plugins/download.php/24644/report_customsql_moodle311_2021070700.zip -o /customsql.zip \
#This is the latest version of plugin moodle31 as of 11Dec2023
Copy link
Member

Choose a reason for hiding this comment

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

same here

&& curl -L https://moodle.org/plugins/download.php/14468/local_mass_enroll_moodle33_2015092402.zip -o /mass.zip \
&& rm flex.zip \

# Kate requested to remove:
Copy link
Member

Choose a reason for hiding this comment

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

please remove this section and include the comment in the commit message

# && rm facetoface.zip \
#

#Updated as of 11Dec2023
Copy link
Member

Choose a reason for hiding this comment

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

same here

RUN sed -i.bak '/public function lang_menu/ i\ public function get_language() {return current_language();}\n' /var/www/html/lib/outputrenderers.php

RUN sleep 3 && echo "\$THEME->removedprimarynavitems = ['courses'];" >> /var/www/html/theme/maker/config.php
##RUN sleep 3 && sed -i "\$a\\n\\n\$THEME->removedprimarynavitems = ['courses'];" /var/www/html/theme/maker/config.php
Copy link
Member

Choose a reason for hiding this comment

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

Is this comment still needed?

Copy link
Author

Choose a reason for hiding this comment

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

Yes, for line 223—this is a requirement from Kate to ensure that the course is not displayed in the students' menu.

# add modified files for Language Icon
COPY themes/maker-header.mustache /var/www/html/theme/maker/templates/header.mustache
COPY themes/boost-language_menu.mustache /var/www/html/theme/boost/templates/language_menu.mustache
COPY themes/updated-icon-designs-4.1/mod/ /var/www/html/theme/maker/pix_plugins/mod
Copy link
Member

Choose a reason for hiding this comment

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

It would be very useful to add some comments about how we got those files. Did you write them or sent by Kate? So for future updates, we can trace them back to the source. Same for the fonts and favicon above.

Copy link
Author

Choose a reason for hiding this comment

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

These mustache codes were modified to meet Kate's requirements based on the UX/UI specifications.

Copy link
Member

Choose a reason for hiding this comment

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

Looks like this file is not being used. If this is a previous version of the theme and tracked in the git repo, we don't need keep it. If we need to rollback, we can revert this file. As long as you have each commit clearly titled and separated.

@xcompass xcompass assigned ubc-tuehoang and unassigned Lannro Sep 4, 2024
@ubc-tuehoang
Copy link
Author

You're right about the comments—these were from the development cycles and need to be cleaned up and removed before the merge. I'll clean the comments in the medicine branch. 👍

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.

4 participants