Skip to content

Conversation

@SteveDala
Copy link

@SteveDala SteveDala commented Nov 12, 2025

Description

The purpose of this pull request is to sync the downstream thoth-tech branch of 9.x with the upstream doubtfire-lms branch of 9.x

image

The motivation is to ensure that company members working on the project are working with the latest version of 9.x from the upstream branch and not duplicating work that has been done.

Type of change

  • New feature (non-breaking change which adds functionality)
  • This change requires a documentation update

How Has This Been Tested?

  1. Rebase local repo of doubtfire-web to doubtfire-lms/doubtfire-web/9.x
  2. Pull latest commits (hashes beginning with 1fdf1e9, 5d2df27 from user b0ink)
  3. Run local Formatif development container within VSCode
  4. Ensure

Testing Checklist:

  • Tested in latest Chrome
  • Tested in latest Safari
  • Tested in latest Firefox

Checklist:

  • My code follows the style guidelines of this project N/A
  • I have performed a self-review of my own code N/A
  • I have commented my code in hard-to-understand areas N/A
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have requested a review from @macite and @jakerenzella on the Pull Request N/A

zara1504 and others added 21 commits March 27, 2025 14:21
* chore: migrate group-set-selector (WIP)

- define and declare new component files

- import new component into app

- downgrade component

* chore: migrate group-set-selector

- convert AngularJS template syntax to Angular syntax
- finish implementing `group-set-selector.component.ts`
- remove redundant Coffeescript file

* chore: migrate group-set-selector

- finish defining Typescript logic
- update parent component to use Angular syntax for child component declaration

* chore: cleanup and documentation

- remove redundant Coffeescript file
- adjust frontend migration todo list

* chore: remove redundant file

- remove redundant Coffeescript file

* fix: attribute and event binding

- fix attribute and event binding syntax
- remove redundant template file

* refactor: two-way binding

- remove redundant directive attributes

- rename EventEmitter var name in child component

* Update README.md

* Update README.md

* refactor: replace Bootstrap components with Angular Material

- replace Bootstrap components with Angular Material components & directives

- refactor to use modern Angular structural directives
* chore: date-service.coffee to TS

- add `date.service.ts` file
- add `date.service.spec.ts` unit test
- downgrade TS module such that it works within AngularJS

* chore: unlink date-service.coffee

- complete unlinking process of  `date-service.coffee` after migrating to Typescript
- manual linting/comment formatting

* chore: delete redundant coffeescript file

- delete `date-service.coffee` file after migration

* chore:  formatting

- format code with prettier
* chore: 9.x windows

* chore: create new component files

* chore: unlink old component + link new component

* chore: migrate functionality + update to tailwindcss and material UI

* chore: remove old component files

* chore: responsive columns for visualisations

* Update package-lock.json

* Update package.json

* Update package.json

* Update package-lock.json

* chore: update styling to better match original

* chore: add custom breakpoint for responsive change

* chore: tweak breakpoint for better visualisation visibility

* chore: update tutor view functionality + tweak event emitter name

---------

Co-authored-by: Boink <40929320+b0ink@users.noreply.github.com>
* fix: update burndown data to render series of different lengths

* chore: cleanup imports

* chore: remove leftover testing comment from previous contributor
* chore: migrate pie chart to ngxchart

* chore: remove testing console log

* chore: restore package and lock to 9.x

* chore: remove testing comments

* chore: resolve merge conflicts

* chore: remove testing console log

* chore: resolve futher conflicts

* chore: exlude packge-lock

* chore: exclude package

* chore: delete migrated progress dashboard html

---------

Co-authored-by: Boink <40929320+b0ink@users.noreply.github.com>
* chore: migrate/unit-staff-editor

- delete old Coffeescript file
- delete old template
- remove reference to old Coffeescript file
- link new component
- downgrade new component

* chore: migrate/unit-staff-editor

- port `unit-staff-editor-component` to Typescript from Coffeescript
- port `unit-staff-editor` template to Angular template syntax w/ Angular Material
- adjust parent component `Inputs` and attribute bindings

* Update README.md

* Update README.md

---------

Co-authored-by: Boink <40929320+b0ink@users.noreply.github.com>
* fix: revert staff role on error

* fix: ensure full search for unit role

* chore: fix casing

* refactor: use mat table for staff editor

* chore: remove unused variables

* fix: null check

* refactor: use icon button

* chore: remove unit staff editor coffeescript file

* chore: add back staff editor tooltips
* Frontend migration of portfolio-grade-select-step to Angular 17 component

* Addressed review comments in portfolio-grade-select-step component

* Implement OnInit in PortfolioGradeSelectStepComponent

* replaced bootsrap UI component with Angular material

* chore: bring back deleted lines

* refactor: replace css with tailwind

* chore: revert import order

* chore: revert import order

* chore: revert import order

* chore: revert order

* refactor: simplify grade changing

---------

Co-authored-by: Pasindu Fernando <116358471+Pasindufdo98@users.noreply.github.com>
* refactor: migrate/tutorials (doubtfire-lms#934)

* chore: migrate tutorials

- unlink old component
- link new component
- delete old files
- add UI-router state declaration
- remove reference to old state

* chore: migrate tutorials

- delete old files

* chore: migrate tutorials

- declare and define `tutorials` Typescript class
- define `tutorials` markup in Angular and Angular material
- add stylesheet

* chore: migrate tutorials

- delete old template

* chore: amend file name

- change template file name to adhere to styling convention
- add `todo` comment to Typescript file

---------

Co-authored-by: Boink <40929320+b0ink@users.noreply.github.com>

* fix: map unit staff

- 9.x api currently exposes :staff instead of :unit_roles

* fix: accurately check for tutorial enrolment

* fix: ensure tutorial for current enrolment is displayed

* refactor: use mat table

* refactor: improve tutorials component and add sorting

- fetch unit to ensure tutorials are loaded correctly
- add table sorting

* chore: format

* chore: remove styling

* chore: remove unused class

* chore: reword description

---------

Co-authored-by: Jason Vellucci <jason.vellucci@live.com>
* refactor: init group members list migration

* refactor: migrate group members list

* chore: update loading text

* chore: remove old component files
* docs: update frontend migration progress list

- Mark all components in the `thoth-tech/9.x` branch as `MIGRATED` if they exist as TS files.

- Mark components with open PRs against the `doubtfire-lms` repo as `MIGRATED`.

* docs: update frontend migration progress list

- remove completed migrations from TODO section

* docs: update frontend migration progress list

- Amend progress list

* docs: update frontend migration progress list

- resolve discrepancies in progress list

- add additional section for components `awaiting upstream review`

- add instructions for PR author and upstream repo maintainer

- update summary section

* docs: fix typos

- fix typos for components in progress list

* docs: amend frontend migration list changes

- remove `AWAITING UPSTREAM REVIEW` section as this wouldn't work for our workflow

- move components from the `AWAITING UPSTREAM REVIEW` section back to the `TODO` section

- leave comment to update `migration progress list` on all PRs for components that were previously in the `AWAITING UPSTREAM REVIEW` section. to verify this, search the PR section in `doubtfire-lms/doubtfire-web`

* docs: further updates to README.MD

- move migrated component to `MIGRATED` section of `Migration Progress List`

* docs: amend migration progress list

- mark components that have .ts files as being migrated

* docs: amend frontend migration progress list

- amend the `No longer in thoth-tech/9.x` section of the frontend migration progress list

* docs: remove duplicates & update tally

- remove duplicates from the MIGRATED section of the frontend migration progress list

- amend tally

* docs: fix formatting

- fix formatting of frontend migration progress list in README.MD

* chore: update repository reference

---------

Co-authored-by: Boink <40929320+b0ink@users.noreply.github.com>
* refactor: init group selector migration

* refactor: move group set selector

* chore: change color of locked icon

* refactor: ability to join group

* refactor: conditional rendering for project view

* chore: ensure group is selected

* chore: add information if group doesnt exist

* chore: disable click event while editing

* refactor: add filters

* chore: fix margins

* chore: fix margins

* chore: remove coffeescript files

* chore: cleanup

* refactor: add locked icon

* refactor: remove group set selector
* refactor: init group set manager migration

* refactor: allow editable group name

* chore: display locked icon

* refactor: replace with new component

* refactor: shorten create group button

* refactor: remove old component

* chore: cleanup

* refactor: hide search bar for students

* refactor: remove css
@SteveDala SteveDala marked this pull request as ready for review November 12, 2025 11:35
@SteveDala
Copy link
Author

Will be addressed by #422

@SteveDala SteveDala closed this Nov 18, 2025
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.

6 participants