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.

Sign up for GitHub

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

Jump to bottom

704 possibility to access interview notes from overview page 2 #914

Closed
wants to merge 25 commits into from
Closed

704 possibility to access interview notes from overview page 2 #914

wants to merge 25 commits into from

Conversation

hei98
Copy link
Contributor

@hei98 hei98 commented Jan 11, 2024

No description provided.

@hei98 hei98 linked an issue Jan 11, 2024 that may be closed by this pull request
Possibility to access interview notes from overview page #704
Closed
@aTrueYety
Copy link
Contributor

aTrueYety commented Jan 16, 2024 •
edited
Loading

Bilde_2024-01-16_200237042
Noe feil her når jeg trykker lagre

@hei98 hei98 self-assigned this Feb 7, 2024
@hei98 hei98 force-pushed the 704-possibility-to-access-interview-notes-from-overview-page-2 branch from ac61b79 to 6669a33 Compare February 8, 2024 18:00
hei98 and others added 18 commits February 8, 2024 19:30
@hei98
Edit interview notes in backend
6f2e1d6
@hei98
Get and edit interview notes from backend
355a447
@hei98
Get and edit interview notes
8f6d4c3
@tiniuspre
Update PHONE_NUMBER_REGEX (#979)
45ccc7a 
* Update PHONE_NUMBER_REGEX

* Update frontend phone number regex

* Phone regex change
@hei98
Revert to old commit and fix error msg
d30121a
@hei98
Remove unused showspinner
df4f9b5
@hei98
Merge branch '704-possibility-to-access-interview-notes-from-overview…
644323e 
…-page-2' of github.com:Samfundet/Samfundet4 into 704-possibility-to-access-interview-notes-from-overview-page-2
@marionlys
show text when there is no active recruitment (#835)
f066ed9 
* show text when there is no active recruitment

* rename og fiksa greier

* fix

* Textitem instead of translation

* fixings

* prettiererror :(

* prettiererror igjen :(
@marionlys @robines
519 Translate Aboutpage (#941)
e3b7106 
* Translate Aboutpage

* Update backend/root/management/commands/seed_scripts/textitems.py

Co-authored-by: Robin <[email protected]>

* Update backend/root/management/commands/seed_scripts/textitems.py

Co-authored-by: Robin <[email protected]>

* Update backend/root/management/commands/seed_scripts/textitems.py

Co-authored-by: Robin <[email protected]>

* Update backend/root/management/commands/seed_scripts/textitems.py

Co-authored-by: Robin <[email protected]>

* Update backend/root/management/commands/seed_scripts/textitems.py

Co-authored-by: Robin <[email protected]>

* Update backend/root/management/commands/seed_scripts/textitems.py

Co-authored-by: Robin <[email protected]>

* fix typo

* ruff

* prettier :(

---------

Co-authored-by: Robin <[email protected]>
@Mathias-a @magsyg
Applicant overview page (#829)
7bf73c2 
* get data into frontend

* Add communication with backend

* fix sorting

* improve position seed script

* fix priority

* fix tests, and move choices to global file

* cleanup

* Fix tests, improve error handling

* fix migration

* finalize view own applications

* finalize view own applications

* ruff

* mmore ruff

* more ruff

* mmore ruff :)

* fix traslat

* fix

* reformat again

* ruff

* fun merge

---------

Co-authored-by: Magnus Øvre Sygard <[email protected]>
Co-authored-by: magsyg <[email protected]>
@hei98
Add putRecruitmentAdmissionInterview function
914591a
@amaliejvik @magsyg
Implement MenuItemComponent for Lyche (#710)
f0592f7 
* Implement MenuItemComponent for Lyche

* Fix ESLint error

Line in LycheMenuPage.tsx too long. Add enter on line.

* Fix formatting errors

* Final fix formatting

* Fix requests from review

* Fix request review and make branch updated with master

* Remove empty scss-file for LycheMenuPage

* Fix hopefully

* Fix woopsie

* Fix woopsie v2

* fix up in css

* fix padding top

* fix font

---------

Co-authored-by: Magnus Øvre Sygard <[email protected]>
Co-authored-by: magsyg <[email protected]>
@hei98
Edit interview notes in backend
5214ed5
@hei98
Get and edit interview notes from backend
e3c615a
@hei98
Get and edit interview notes
aff9b67
@hei98
Revert to old commit and fix error msg
3a8f109
@hei98
Remove unused showspinner
9501443
@hei98
Get and edit interview notes
9bb7cce
hei98 added 3 commits February 10, 2024 14:50
@hei98
Revert to old commit and fix error msg
f1e3628
@hei98
Add putRecruitmentAdmissionInterview function
8def7e2
@hei98
Merge branch '704-possibility-to-access-interview-notes-from-overview…
793f20c 
…-page-2' of github.com:Samfundet/Samfundet4 into 704-possibility-to-access-interview-notes-from-overview-page-2
@hei98
Copy link
Contributor Author

hei98 commented Feb 12, 2024

Bilde_2024-01-16_200237042 Noe feil her når jeg trykker lagre

Skal være fikset nå

@emilte
Copy link
Member

emilte commented Feb 12, 2024

Hvorfor ser denne så stor ut? Er 34 filer riktig?

@hei98
Copy link
Contributor Author

hei98 commented Feb 12, 2024

Hvorfor ser denne så stor ut? Er 34 filer riktig?

Hmm, tror ikke det er helt riktig. Jeg gikk først tilbake til en tidligere commit også etter å ha fikset koden har jeg gjort en rebase for å få de nyeste endringene fra master inn i denne branchen.
Jeg har gjort endringene:

  • linje 694 i backend/samfundet/serializers.py
  • frontend/src/PagesAdmin/InterviewNotesAdminPage/InterviewNotesAdminPage.tsx
  • la til putRecruitmentAdmission i frontend/src/api.ts
  • fikset på pathen til interview notes i frontend/src/routes/frontend.ts

Er det bedre om jeg går tilbake til commiten før rebasen også kan jeg merge etter folk har reviewet?

@emilte
Copy link
Member

emilte commented Feb 12, 2024

Det er langt tryggere og enklere å bruke merge. Da kan du reversere

@emilte
Copy link
Member

emilte commented Feb 12, 2024

Bygger denne på en annen branch som ikke er merget? Gjerne skriv i desc

@hei98
Copy link
Contributor Author

hei98 commented Feb 12, 2024

Ja, kan lage en ny branch og flytte det over

@Snorre98
Copy link
Contributor

@hei98 hva er status her? Hvis denne løses en annen plass kan du lukket PRen og kanskje kommentere hvorfor du lukket den.

@hei98
Copy link
Contributor Author

hei98 commented Feb 16, 2024

Laget ny branch https://github.com/Samfundet/Samfundet4/pull/986

@hei98 hei98 closed this Feb 16, 2024
@emilte emilte deleted the 704-possibility-to-access-interview-notes-from-overview-page-2 branch February 16, 2024 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilte emilte Awaiting requested review from emilte

@evgiz evgiz Awaiting requested review from evgiz

@Mathias-a Mathias-a Awaiting requested review from Mathias-a Mathias-a is a code owner

@robines robines Awaiting requested review from robines robines is a code owner

Assignees

@hei98 hei98

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Possibility to access interview notes from overview page
8 participants
@hei98 @aTrueYety @emilte @Snorre98 @tiniuspre @marionlys @Mathias-a @amaliejvik