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

Fix/same submission #829

Merged
merged 10 commits into from
Dec 19, 2022
Merged

Conversation

cyfml
Copy link
Contributor

@cyfml cyfml commented Dec 4, 2022

  1. fixed same submission problem which leads Comparision-Viewer broken.
  2. fixed issue: The folder in the results holding the submission files should be renamed from "submissions" to "files", and report-viewer also supports old version of Jplag. (e.g. submissions in zip file).
  3. Enhancement:
  • where the files are dropped should contain a line of text that states that no files get uploaded anywhere
  • The code comparison view always shows "submission 1" and "submission 2", but should show the names. But not if the names are hidden.
  • In the code comparison view, the left sidebar should be visible by default

@cyfml cyfml force-pushed the fix/same-submission-and-root-name branch from 9f8c7e8 to 58272be Compare December 4, 2022 17:04
@tsaglam tsaglam added bug Issue/PR that involves a bug minor Minor issue/feature/contribution/change report-viewer PR / Issue deals (partly) with the report viewer and thus involves web-dev technologies labels Dec 5, 2022
Copy link
Member

@tsaglam tsaglam left a comment

Choose a reason for hiding this comment

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

You should only touch the report generation here, so do not change the pipeline before that step. You changed:
grafik

@cyfml
Copy link
Contributor Author

cyfml commented Dec 16, 2022

Now, report-viewer supports old version of Jplag. I also find a bug in the previous PR. This bug is: if root name or sub directory is also called "submissions". The Comparison view will not be broken but show not full path, then it influences the highlighting.
Previous one seems a coincidental, now i fixed this problem.

@tsaglam tsaglam requested a review from sebinside December 19, 2022 08:15
Copy link
Member

@tsaglam tsaglam left a comment

Choose a reason for hiding this comment

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

Review for the Java changes, I found just one small thing.

@sebinside
Copy link
Member

Besides this change, I have nothing to complain. I'm not happy with the complexity of the extractFileNameWithFullPath function but have no better solution. In my testing, everything worked fine. Can be merged after the small change mentioned above.

@cyfml
Copy link
Contributor Author

cyfml commented Dec 19, 2022

@sebinside Yes. The complexity of the extractFileNameWithFullPath function is pretty bad. No better solution because we need support old Jplag. I will change this problem mentioned above in 10 minutes.

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

87.5% 87.5% Coverage
0.0% 0.0% Duplication

@cyfml
Copy link
Contributor Author

cyfml commented Dec 19, 2022

@tsaglam @sebinside I suggest, it's better to change the name of PR to "Fix/same submission". Same root problem was postponed.

@cyfml cyfml changed the title Fix/same submission and root name Fix/same submission Dec 19, 2022
@sebinside sebinside merged commit 8aec8c0 into jplag:develop Dec 19, 2022
@sebinside
Copy link
Member

Thank you @cyfml, I just merged this PR and updated issue #710. I also added a new strange bug that I discovered while testing (also prior to this PR). Maybe you can also find a solution to this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Issue/PR that involves a bug minor Minor issue/feature/contribution/change report-viewer PR / Issue deals (partly) with the report viewer and thus involves web-dev technologies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants