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

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

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5fc4869
Edit interview notes in backend
hei98 Jan 9, 2024
45ee98b
Get and edit interview notes from backend
hei98 Jan 9, 2024
67c9267
Get and edit interview notes
hei98 Jan 11, 2024
6669a33
Revert to old commit and fix error msg
hei98 Feb 7, 2024
6f2e1d6
Edit interview notes in backend
hei98 Jan 9, 2024
355a447
Get and edit interview notes from backend
hei98 Jan 9, 2024
8f6d4c3
Get and edit interview notes
hei98 Jan 11, 2024
45ccc7a
Update PHONE_NUMBER_REGEX (#979)
tiniuspre Feb 8, 2024
d30121a
Revert to old commit and fix error msg
hei98 Feb 7, 2024
df4f9b5
Remove unused showspinner
hei98 Feb 8, 2024
644323e
Merge branch '704-possibility-to-access-interview-notes-from-overview…
hei98 Feb 8, 2024
f066ed9
show text when there is no active recruitment (#835)
marionlys Feb 8, 2024
e3b7106
519 Translate Aboutpage (#941)
marionlys Feb 8, 2024
7bf73c2
Applicant overview page (#829)
Mathias-a Feb 8, 2024
914591a
Add putRecruitmentAdmissionInterview function
hei98 Feb 9, 2024
f0592f7
Implement MenuItemComponent for Lyche (#710)
amaliejvik Feb 10, 2024
5214ed5
Edit interview notes in backend
hei98 Jan 9, 2024
e3c615a
Get and edit interview notes from backend
hei98 Jan 9, 2024
aff9b67
Get and edit interview notes
hei98 Jan 11, 2024
3a8f109
Revert to old commit and fix error msg
hei98 Feb 7, 2024
9501443
Remove unused showspinner
hei98 Feb 8, 2024
9bb7cce
Get and edit interview notes
hei98 Jan 11, 2024
f1e3628
Revert to old commit and fix error msg
hei98 Feb 7, 2024
8def7e2
Add putRecruitmentAdmissionInterview function
hei98 Feb 9, 2024
793f20c
Merge branch '704-possibility-to-access-interview-notes-from-overview…
hei98 Feb 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 43 additions & 45 deletions backend/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/root/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ class Environment:

# Phone number regex

PHONE_NUMBER_REGEX = r'^(\+?\(?\d{3}\)?[-\s\.]?)?\d{3}[-\s\.]?\d{4,6}$'
PHONE_NUMBER_REGEX = r'^\+?\s*(\d\s*){8,15}$'
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ def seed():
position_data = POSITION_DATA.copy()
position_data.update(
{
'name_nb': f'Stilling {i}',
'name_en': f'Position {i}',
'name_nb': f'{gang.abbreviation} stilling {i}',
'name_en': f'{gang.abbreviation} position {i}',
'gang': gang,
'recruitment': recruitment,
}
Expand Down
62 changes: 57 additions & 5 deletions backend/root/management/commands/seed_scripts/textitems.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,65 @@ def seed():
'text_nb': 'Har du spørsmål eller ønsker å komme i kontakt med oss? Ikke nøl med å ta kontakt!',
'text_en': 'Do you have any questions or want to get in touch with us? Don"t hesitate to contact us!',
},
{
'key': 'festivals',
'text_nb': 'Annenhvert år arrangeres Norges største kulturfestival UKA og verdens største internasjonale tematiske studentfestival under Studentersamfundets paraply.',
'text_en': "Every other year, Norway's largest cultural festival UKA and the world's largest international thematic student festival are organized under Studentersamfundet's umbrella.",
},
{
'key': 'volunteering',
'text_nb': 'Det meste av arbeid på Studentersamfundet i Trondhjem gjøres gjennom dugnad av studenter. Arbeidet er organisert i enheter som kalles gjenger. Potensielle nye medlemmer må søke den aktuelle gjengen om opptak, og gjengen vurderer hver enkelt søker. Med sine omtrent 1700 frivillige utgjør det indre miljøet i Studentersamfundet en betydelig del av det organiserte fritidstilbudet til studenter i Trondheim.',
'text_en': 'Most of the work at Samfundet is done on a voluntary basis by students. The work is organized into units called groups. Prospective new members must apply to the appropriate group for admission and the group reviews each applicant. With around 1700 volunteers, the internal environment of Samfundet constitutes a significant part of organized leisure activities for students in Trondheim.',
},
{
'key': 'the_society_meeting',
'text_nb': 'Samfundsmøtet er Studentersamfundets høyeste organ. Her velges leder samt medlemmer til Finansstyret og Rådet. Lederen velger ut sitt eget styre, som utformer den politiske profilen og representer medlemmene og foreningen Samfundet. Finansstyret administrerer forretningsdriften. Rådet kontrollerer at all virksomhet i Samfundet foregår i henhold til norske og interne lover. Samfundet har en daglig leder, økonomiansvarlig, husøkonom, vaktmester og renholdspersonell som er ansatte.',
'text_en': "The Society Meeting is our highest organ. We elect the leader here, as well as members of the Finance Board and the Council. The leader, elected politically, chooses his or her own Board, which forms the House's political profile and represents all of Samfundet's members. The Finance Board manages the business. The Council ensures that all activities at Samfundet take place according to Norwegian and internal laws. Samfundet has a general manager, financial manager, house-economist, caretaker and cleaning staff who are employees.",
},
{
'key': 'about_samfundet',
'text_nb': 'Studentersamfundet i Trondhjem er en organisasjon for studenter i Trondheim som eies og drives av sine rundt 16 100 medlemmer. Formålsparagrafen vår sier at ”Studentersamfundet skal være det naturlige samlingsstedet for studenter i Trondhjem”. Vårt røde runde huser konserter, ulike kulturarrangementer, utallige barer, en kafé og en restaurant. Mest sagnomsust er Samfundsmøtene, viet til debatt om politikk og aktuelle spørsmål, eller til underholdning og moro. Samfundet har også tre av Trondheims beste konsertscener.',
'text_en': "Samfundet is an organization for students in Trondheim that is owned and run by its approximately 16100 members. Our mission statement is Samfundet will be the natural meeting place for students in Trondheim. In our red, round building we regularly host concerts and various cultural events, and have countless bars, a café and a restaurant. The Society Meetings are perhaps our most famous events. These meetings serve as a place for debating politics and current events, and but also for entertainment and fun. Samfundet also has three of Trondheim's best music venues.",
},
{
'key': 'no_recruitment_text',
'text_nb': 'Det er for tiden ingen opptak på Samfundet',
'text_en': 'There are currently no recruitments at Samfundet',
},
{
'key': 'no_recruitment_text_0',
'text_nb': 'Vi har opptak på starten av hvert semester og ønsker at du søker til oss som frivillig!',
'text_en': 'We have recruitments at the start of each semester and would like you to apply to us as a volunteer!',
},
{
'key': 'no_recruitment_text_1',
'text_nb': 'Studentersamfundet i Trondhjem er Norges største studentersamfund og vi har et tilbud andre byer bare kan drømme om.',
'text_en': 'Studentersamfundet in Trondhjem is Norways largest student society and we have an offer that other cities can only dream of.',
},
{
'key': 'no_recruitment_text_2',
'text_nb': 'Nesten uansett hvilken studiebakgrunn eller interesser du har, så finnes det en frivillig gjeng som søker nettopp deg!',
'text_en': 'Almost regardless of your study background or interests, there is a group of volunteers looking for you!',
},
{
'key': 'no_recruitment_text_3',
'text_nb': 'Omtrent 2000 studenter bidrar allerede frivillig! Du kan være med å jobbe med blant annet lyd, lys, teater, snekring, IT, artistbooking, korsang, musikk og mye annet. Du kan lære mye av å jobbe på Samfundet, og du blir garantert kjent med mange andre studenter.',
'text_en': 'Approximately 2,000 students are already contributing voluntarily! You can help work with, among other things, sound, lighting, theatre, carpentry, IT, artist booking, choir singing, music and much more. You can learn a lot from working at Samfundet, and you are guaranteed to get to know many other students.',
},
{
'key': 'no_recruitment_text_4',
'text_nb': 'For mer informasjon om samfundets gjenger ',
'text_en': 'For more information about the groups ',
},
{
'key': 'no_recruitment_text_5',
'text_nb': 'Hvis du allerede har søkt kan du logge inn som søker for å prioritere og følge med på dine søknader.',
'text_en': 'If you have already applied, you can log in as an applicant to prioritize and monitor your applications.',
},
{
'key': 'sulten_reservation_help',
'text_nb': """Bord må reserveres minst en dag i forveien. Mat kan forhåndsbestilles slik at dere ikke trenger å vente når dere kommer.
Merk at flertallet av personer må være medlem for å reservere og at alle må være over 20 år etter kl 20:00 i helger.""",
'text_en': """Tables must be reserved at least one day in advance. Food can be pre-ordered so you do not have to wait when you arrive.
Note that the majority of people must be a member of the Student Society to reserve
and that all must be over 20 years after 20:00 on weekends.""",
'text_nb': 'Bord må reserveres minst en dag i forveien. Mat kan forhåndsbestilles slik at dere ikke trenger å vente når dere kommer. Merk at flertallet av personer må være medlem for å reservere og at alle må være over 20 år etter kl 20:00 i helger.',
'text_en': 'Tables must be reserved at least one day in advance. Food can be pre-ordered so you do not have to wait when you arrive. Note that the majority of people must be a member of the Student Society to reserve and that all must be over 20 years after 20:00 on weekends.',
},
{
'key': 'sulten_reservation_contact',
Expand Down
3 changes: 0 additions & 3 deletions backend/samfundet/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -587,19 +587,16 @@ def admissions_count(self, obj: RecruitmentPosition) -> int:
@admin.register(RecruitmentAdmission)
class RecruitmentAdmissionAdmin(CustomBaseAdmin):
sortable_by = [
'id',
'recruitment_position',
'recruitment',
'user',
]
list_display = [
'id',
'recruitment_position',
'recruitment',
'user',
]
search_fields = [
'id',
'recruitment_position',
'recruitment',
'user',
Expand Down
1 change: 0 additions & 1 deletion backend/samfundet/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
https://docs.pytest.org/en/7.1.x/how-to/fixtures.html
"""


TestCase.databases = {'default', 'billig'}


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 5.0 on 2024-02-08 17:15

import uuid
from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("samfundet", "0007_recruitmentadmission_withdrawn_and_more"),
]

operations = [
migrations.AlterField(
model_name="recruitmentadmission",
name="id",
field=models.UUIDField(
default=uuid.uuid4, editable=False, primary_key=True, serialize=False
),
),
]
Loading
Loading