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

Migrate/project tasks list updated #263

Open
wants to merge 38 commits into
base: 8.0.x
Choose a base branch
from

Conversation

washyking
Copy link

@washyking washyking commented Nov 21, 2024

Description

The purpose of 'project-tasks-list' is to show the tasks that a student has interacted with. Showing the status of the task visually e.g Not started, Completed, Time exceeded etc.

Type of change

  • This change requires a documentation update
  • Migration from coffee (angularjs) to Angular 17

How Has This Been Tested?

Login in using avencor user. Select a unit; click the drop down and choose portfolio; choose a student; finally click view progress.

I have tested this code by using the browser and have Screenshots will show comparison between previous and current implementation in various browsers.
#Before:
Screenshot 2024-11-21 at 12 46 29 pm
Screenshot 2024-11-21 at 12 45 09 pm

#After
project-tasks-list-after chrome

project-tasks-list-after firefox_2

Testing Checklist:

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

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code in hard-to-understand areas
  • 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

…remove unused no data template

Signed-off-by: washyking <[email protected]>
Signed-off-by: washyking <[email protected]>
Signed-off-by: washyking <[email protected]>
@Shounaks
Copy link

incorrect Base Branch , use origin.8.0.x.

@washyking washyking changed the base branch from development to 8.0.x November 21, 2024 08:59
@washyking
Copy link
Author

incorrect Base Branch , use origin.8.0.x.

branch changed

Copy link

@Shounaks Shounaks left a comment

Choose a reason for hiding this comment

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

These are the major changes which I forsee. will check in depth in some time.

@@ -0,0 +1,73 @@
@import '../../../../build/assets/doubtfire.css';

.project-tasks-list {

Choose a reason for hiding this comment

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

Use Tailwind CSS for all the newer components

Copy link
Author

Choose a reason for hiding this comment

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

Just made changes using tailwind in line style and tailwind.config.js

<div class="panel-body text-center">
<p class="btn-group">
<label ng-repeat="grade in grades" ng-if="$index != 4" ng-click="chooseGrade($index)" class="btn btn-default col-sm-3 text-center" ng-model="project.targetGrade" btn-radio="{{$index}}">
<grade-icon grade="grade" tooltip="Select a {{grade}} as your target grade" tooltip-append-to-body="true" class="text-{{$index == project.targetGrade ? 'primary' : 'muted'}}"></grade-icon>

Choose a reason for hiding this comment

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

Copy link
Author

Choose a reason for hiding this comment

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

Not sure if its in my scope. I was migrating project-tasks-list to angular so only focused on the component. I think i might have commited extra file for some reason.

#
# View a list of tasks
#
.directive('studentTaskList', ->

Choose a reason for hiding this comment

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

Shouldn't CoffeeScript code be removed? whats happening here?

Copy link
Author

Choose a reason for hiding this comment

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

Not part of my task, I dont why thats there. I will delete the file

@@ -305,6 +305,10 @@ DoubtfireAngularJSModule.factory(
DoubtfireAngularJSModule.factory('CreateNewUnitModal', downgradeInjectable(CreateNewUnitModal));

// directive -> component
DoubtfireAngularJSModule.directive(
'projectTasksList',

Choose a reason for hiding this comment

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

are you sure that this should be projectTaskList and not fProjectTaskList

Copy link
Author

Choose a reason for hiding this comment

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

just made the change adding f- infront of my component

@anmol-sainii
Copy link

need to fix this issue still-
the text is not fully showing up in the bubble in your version.
Here's what it looks like on the base branch:
Screenshot 2024-11-26 at 1 35 28 PM
And heres what it looks like on your version:
Screenshot 2024-11-26 at 1 16 17 PM

I have tested this on safari and google chrome and firefox and it looks like this on all.

@washyking
Copy link
Author

need to fix this issue still- the text is not fully showing up in the bubble in your version. Here's what it looks like on the base branch: Screenshot 2024-11-26 at 1 35 28 PM And heres what it looks like on your version: Screenshot 2024-11-26 at 1 16 17 PM

I have tested this on safari and google chrome and firefox and it looks like this on all.

Bug-fix Thanks for that. I hadnt handled the words wrapping in the tooltip. Now fixed

@anmol-sainii
Copy link

The text is now wrapping properly. However is pretty hard to read
Here's what your version looks like:
Screenshot 2024-11-26 at 8 42 01 PM
Heres the base branch version
Screenshot 2024-11-26 at 8 48 35 PM
I think it just needs a fill colour perhaps?

@washyking
Copy link
Author

The text is now wrapping properly. However is pretty hard to read Here's what your version looks like: Screenshot 2024-11-26 at 8 42 01 PM Heres the base branch version Screenshot 2024-11-26 at 8 48 35 PM I think it just needs a fill colour perhaps?

Screenshot 2024-11-26 at 9 51 03 pm Screenshot 2024-11-26 at 9 51 09 pm Just made a fix contrasting the backgournd more

@washyking washyking requested a review from Shounaks December 1, 2024 08:09
…finition-editor/task-definition-upload/task-definition-upload.component 2.ts
…finition-editor/task-definition-overseer/task-definition-overseer.component 2.ts
…finition-editor/task-definition-resources/task-definition-resources.component 2.html
…finition-editor/task-definition-resources/task-definition-resources.component 3.html
@Shounaks
Copy link

Shounaks commented Dec 4, 2024

Review

Thanks @washyking , for this PR. I have gone through the code, and everything looks correct.

Steps to Replicate on local

  1. Login Using Admin

  2. Click on Portfolio
    image

  3. Click on View Progress
    image

  4. Test the component.

Testing the component

Before Hover

image

After Hover

image

Everything looks correct, except the glowing letters are a bit hard to read, and something that didnt existed before, as @anmol-sainii , pointed out, this error is still present.

I am approving this, but just make a CSS Patch before pushing it to upstream review.

@XinHuang1112
Copy link

I have tested your code on my local machine, and it looks all good. The code changes are all right. I believe you have successfully migrated the project-task-list component.

@nodogx
Copy link

nodogx commented Dec 5, 2024

I have also tested your code by running it on the local device. Everything seems to work. I have reviewed the code as well and everything seems good to go. I approve these changes.

Copy link

@nodogx nodogx left a comment

Choose a reason for hiding this comment

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

Seems good

@aNebula
Copy link

aNebula commented Dec 9, 2024

[ ] @washyking - Please change the glowing letters.
@nodogx and @XinHuang1112 - you have not reviewed properly.

Signed-off-by: washyking <[email protected]>
@washyking
Copy link
Author

washyking commented Dec 11, 2024

Glowing letters have been fixed in safari.

Screenshot 2024-12-11 at 9 45 53 am

Glowing letters fixed in chrome

Screenshot 2024-12-11 at 9 46 41 am

Copy link

@nodogx nodogx left a comment

Choose a reason for hiding this comment

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

This code looks much better:

Before: (original files before migration)
Screenshot 2024-12-12 at 12 31 20 am

After Migration:
Screenshot 2024-12-12 at 12 31 07 am

The glowing letters look so much better; however, its still slightly present. Everything else works as intended. Approving this as the glowing letters, after the fix is barely noticeable. Good Job :)

@XinHuang1112
Copy link

Your code logic is essentially consistent with the original logic. I tested your code on my local machine and found that you have resolved the issue with the glowing letters.
image

I believe you have completed the migration of the project-tasks-list component, so I have approved your PR.

@aNebula aNebula self-requested a review December 21, 2024 05:25
Copy link

@aNebula aNebula left a comment

Choose a reason for hiding this comment

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

Good work @washyking. Please open upstream pull request with these changes against the upstream repo doubtfire-lms/doubtfire-web, branch 8.0.x

@washyking
Copy link
Author

Good work @washyking. Please open upstream pull request with these changes against the upstream repo doubtfire-lms/doubtfire-web, branch 8.0.x

Opened PR in that branch #277

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