Merge branch 'main' into withdraw-application

This commit is contained in:
Gowtham Sai 2022-09-12 11:25:43 +05:30 committed by GitHub
commit 3071b1f1b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 3 deletions

View File

@ -79,6 +79,25 @@ class Student(StudentAdmin):
queryset.update(can_apply=True) queryset.update(can_apply=True)
self.message_user(request, "Registered the users") self.message_user(request, "Registered the users")
class PlacementResources(resources.ModelResource):
class Meta:
model = Placement
exclude = ('id','changed_by', 'is_company_details_pdf', 'is_description_pdf',
'is_compensation_details_pdf', 'is_selection_procedure_details_pdf')
class AdminAdmin(ExportMixin, SimpleHistoryAdmin):
resource_class = PlacementResources
class PlacementResources(resources.ModelResource):
class Meta:
model = Placement
exclude = ('id', 'changed_by', 'is_company_details_pdf', 'is_description_pdf',
'is_compensation_details_pdf', 'is_selection_procedure_details_pdf')
class AdminAdmin(ExportMixin, SimpleHistoryAdmin):
resource_class = PlacementResources
class PlacementResources(resources.ModelResource): class PlacementResources(resources.ModelResource):
class Meta: class Meta:

View File

@ -326,7 +326,7 @@ def send_opening_notifications(placement_id):
"company_name": placement.company_name, "company_name": placement.company_name,
"opening_type": 'Placement', "opening_type": 'Placement',
"designation": placement.designation, "designation": placement.designation,
"deadline": placement.deadline_datetime.strftime("%Y-%m-%d %H:%M:%S"), "deadline": placement.deadline_datetime.strftime("%A, %-d %B %Y, %-I:%M %p"),
"link": PLACEMENT_OPENING_URL.format(id=placement.id) "link": PLACEMENT_OPENING_URL.format(id=placement.id)
} }
sendEmail(student_user.email, subject, data, NOTIFY_STUDENTS_OPENING_TEMPLATE) sendEmail(student_user.email, subject, data, NOTIFY_STUDENTS_OPENING_TEMPLATE)

View File

@ -8,7 +8,8 @@ python# CDC - Backend
2. Create a Virtual Environment in the [CDC_Backend](./) folder with this command below <br> 2. Create a Virtual Environment in the [CDC_Backend](./) folder with this command below <br>
`python -m venv venv` `python -m venv venv`
3. Activate the environment with this command <br> 3. Activate the environment with this command <br>
`.\venv\Scripts\activate` `.\venv\Scripts\activate` (for WINDOWS) <br>
`source ./venv/bin/activate` (for LINUX)
4. Install the dependencies <br> 4. Install the dependencies <br>
`pip install -r requirements.txt ` `pip install -r requirements.txt `
5. Ensure that you have the PostgreSQL installed on your machine and is running on PORT **5432** <br> 5. Ensure that you have the PostgreSQL installed on your machine and is running on PORT **5432** <br>
@ -17,7 +18,8 @@ python# CDC - Backend
### Running the Application ### Running the Application
1. Activate the environment with this command. <br> 1. Activate the environment with this command. <br>
`.\venv\Scripts\activate` `.\venv\Scripts\activate` (for WINDOWS) <br>
`source ./venv/bin/activate` (for LINUX)
2. Start the application by running this command (_Run the command where [manage.py](./CDC_Backend/manage.py) is 2. Start the application by running this command (_Run the command where [manage.py](./CDC_Backend/manage.py) is
located_) <br> located_) <br>
` python manage.py runserver` ` python manage.py runserver`

16
doc/setup/postgres.md Normal file
View File

@ -0,0 +1,16 @@
typical conf file for pg_hba.conf for dev work.
# TYPE DATABASE USER ADDRESS METHOD
# "local" is for Unix domain socket connections only
local all all md5
# IPv4 local connections:
host all all 127.0.0.1/32 md5
# IPv6 local connections:
host all all ::1/128 md5
# Allow replication connections from localhost, by a user with the
# replication privilege.
local replication all peer
host replication all 127.0.0.1/32 ident
host replication all ::1/128 ident