Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 28 additions & 18 deletions .github/workflows/welcome-new-contributors.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
name: 'Welcome new contributors'

on:
issues:
types: [opened]
pull_request_target:
types: [opened]

jobs:
greet-the-contributor:
runs-on: ubuntu-latest
steps:
- uses: garg3133/welcome-new-contributors@v1.1
with:
token: ${{ secrets.BOT_ACCESS_TOKEN }}
is-oauth-token: true
issue-message: 'Hi! Thanks for opening your first issue at Fusion. We really appreciate it. :raised_hands:'
pr-message: 'Congratulations for making your first Pull Request at Fusion!! :tada: Someone from our team will review it soon.'
name: Welcome New Contributors

on:
issues:
types: [opened]
pull_request_target:
types: [opened]

permissions:
contents: read
issues: write
pull-requests: write

jobs:
greet-the-contributor:
runs-on: ubuntu-latest

steps:
- name: Welcome First-Time Contributors
uses: garg3133/welcome-new-contributors@v1.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
is-oauth-token: true
issue-message: |
Hi! Thanks for opening your first issue at Fusion. We really appreciate it. 🙌
pr-message: |
Congratulations for making your first Pull Request at Fusion!! 🎉
Someone from our team will review it soon.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,7 @@ package-lock.json

.DS_Store
**/generated.pdf


# module specific testing files
Fusion\FusionIIIT\applications\audit_account\tests
2 changes: 1 addition & 1 deletion FusionIIIT/Fusion/celery.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from django.conf import settings

# set the default Django settings module for the 'celery' program.
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Fusion.settings')
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Fusion.settings.development')
app = Celery('Fusion')

# Using a string here means the worker will not have to
Expand Down
18 changes: 17 additions & 1 deletion FusionIIIT/Fusion/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@
# CELERY STUFF
# CELERY_BROKER_URL = 'redis://localhost:6379'
# CELERY_RESULT_BACKEND = 'redis://localhost:6379'

CELERY_BROKER_URL = 'redis://127.0.0.1:6379/0'
CELERY_ACCEPT_CONTENT = ['json']
CELERY_TASK_SERIALIZER = 'json'

CELERY_ACCEPT_CONTENT = ['application/json']
CELERY_TASK_SERIALIZER = 'json'
CELERY_RESULT_SERIALIZER = 'json'
Expand All @@ -89,9 +94,19 @@
'leave-migration-task': {
'task': 'applications.leave.tasks.execute_leave_migrations',
'schedule': crontab(minute='1', hour='0')
},
'audit-account-escalation-task': {
'task': 'applications.audit_account.tasks.run_audit_account_escalations',
'schedule': crontab(minute='*/30')
}
}

AUDIT_ACCOUNT_REQUEST_THRESHOLD_HOD = '25000'
AUDIT_ACCOUNT_REQUEST_THRESHOLD_DEAN = '100000'
AUDIT_ACCOUNT_TA_HIGH_VALUE_THRESHOLD = '50000'
AUDIT_ACCOUNT_REQUEST_ESCALATION_HOURS = 24
AUDIT_ACCOUNT_TA_ESCALATION_HOURS = 24

# Application definition

INSTALLED_APPS = [
Expand Down Expand Up @@ -140,6 +155,7 @@
'applications.income_expenditure',
'applications.hr2',
'applications.department',
'applications.audit_account',
'applications.iwdModuleV2',
'allauth',
'allauth.account',
Expand Down Expand Up @@ -288,4 +304,4 @@
# session settings
SESSION_COOKIE_AGE = 15 * 60
SESSION_EXPIRE_AT_BROWSER_CLOSE = True
SESSION_SAVE_EVERY_REQUEST = True
SESSION_SAVE_EVERY_REQUEST = True
108 changes: 56 additions & 52 deletions FusionIIIT/Fusion/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,77 +21,81 @@
from django.conf.urls.static import static
from django.contrib import admin
from django.contrib.auth import views as auth_views
from django.urls import path
from django.urls import path, include

from applications.globals.views import RateLimitedPasswordResetView


urlpatterns = [
url(r'^', include('applications.globals.urls')),
url(r'^feeds/', include('applications.feeds.urls')),
url(r'^admin/', admin.site.urls),
url(r'^academic-procedures/', include('applications.academic_procedures.urls')),
url(r'^aims/', include('applications.academic_information.urls')),
url(r'^notifications/', include('applications.notifications_extension.urls')),
url(r'^estate/', include('applications.estate_module.urls')),
url(r'^dep/', include('applications.department.urls')),
url(r'^programme_curriculum/',include('applications.programme_curriculum.urls')),
url(r'^iwdModuleV2/', include('applications.iwdModuleV2.urls')),
url(r'^__debug__/', include(debug_toolbar.urls)),
url(r'^research_procedures/', include('applications.research_procedures.urls')),
url(r'^accounts/', include('allauth.urls')),


url(r'^eis/', include('applications.eis.urls')),
url(r'^mess/', include('applications.central_mess.urls')),
url(r'^complaint/', include('applications.complaint_system.urls')),
url(r'^healthcenter/', include('applications.health_center.urls')),
url(r'^leave/', include('applications.leave.urls')),
url(r'^placement/', include('applications.placement_cell.urls')),
url(r'^filetracking/', include('applications.filetracking.urls')),
url(r'^spacs/', include('applications.scholarships.urls')),
url(r'^visitorhostel/', include('applications.visitor_hostel.urls')),
url(r'^office/', include('applications.office_module.urls')),
url(r'^finance/', include('applications.finance_accounts.urls')),
url(r'^purchase-and-store/', include('applications.ps1.urls')),
url(r'^gymkhana/', include('applications.gymkhana.urls')),
url(r'^library/', include('applications.library.urls')),
url(r'^establishment/', include('applications.establishment.urls')),
url(r'^ocms/', include('applications.online_cms.urls')),
url(r'^counselling/', include('applications.counselling_cell.urls')),
url(r'^hostelmanagement/', include('applications.hostel_management.urls')),
url(r'^income-expenditure/', include('applications.income_expenditure.urls')),
url(r'^hr2/', include('applications.hr2.urls')),
url(r'^recruitment/', include('applications.recruitment.urls')),
url(r'^examination/', include('applications.examination.urls')),
url(r'^otheracademic/', include('applications.otheracademic.urls')),

url(r"^", include("applications.globals.urls")),
url(r"^feeds/", include("applications.feeds.urls")),
url(r"^admin/", admin.site.urls),
url(r"^academic-procedures/", include("applications.academic_procedures.urls")),
url(r"^aims/", include("applications.academic_information.urls")),
url(r"^notifications/", include("applications.notifications_extension.urls")),
url(r"^estate/", include("applications.estate_module.urls")),
url(r"^dep/", include("applications.department.urls")),
url(r"^programme_curriculum/", include("applications.programme_curriculum.urls")),
url(r"^iwdModuleV2/", include("applications.iwdModuleV2.urls")),
url(r"^__debug__/", include(debug_toolbar.urls)),
url(r"^research_procedures/", include("applications.research_procedures.urls")),
url(r"^accounts/", include("allauth.urls")),
url(r"^eis/", include("applications.eis.urls")),
url(r"^mess/", include("applications.central_mess.urls")),
url(r"^complaint/", include("applications.complaint_system.urls")),
url(r"^healthcenter/", include("applications.health_center.urls")),
url(r"^leave/", include("applications.leave.urls")),
url(r"^placement/", include("applications.placement_cell.urls")),
url(r"^filetracking/", include("applications.filetracking.urls")),
url(r"^spacs/", include("applications.scholarships.urls")),
url(r"^visitorhostel/", include("applications.visitor_hostel.urls")),
url(r"^office/", include("applications.office_module.urls")),
url(r"^finance/", include("applications.finance_accounts.urls")),
url(r"^purchase-and-store/", include("applications.ps1.urls")),
url(r"^gymkhana/", include("applications.gymkhana.urls")),
url(r"^library/", include("applications.library.urls")),
url(r"^establishment/", include("applications.establishment.urls")),
url(r"^ocms/", include("applications.online_cms.urls")),
url(r"^counselling/", include("applications.counselling_cell.urls")),
url(r"^hostelmanagement/", include("applications.hostel_management.urls")),
url(r"^income-expenditure/", include("applications.income_expenditure.urls")),
url(r"^hr2/", include("applications.hr2.urls")),
url(r"^recruitment/", include("applications.recruitment.urls")),
url(r"^examination/", include("applications.examination.urls")),
url(r"^otheracademic/", include("applications.otheracademic.urls")),
path(
'password-reset/',
"password-reset/",
RateLimitedPasswordResetView.as_view(
template_name='registration/password_reset_form.html',
template_name="registration/password_reset_form.html",
),
name='reset_password',
name="reset_password",
),
path(
'password-reset/done/',
"password-reset/done/",
auth_views.PasswordResetDoneView.as_view(
template_name='registration/password_reset_done.html'
template_name="registration/password_reset_done.html"
),
name='password_reset_done',
name="password_reset_done",
),
path(
'reset/<uidb64>/<token>/',
"reset/<uidb64>/<token>/",
auth_views.PasswordResetConfirmView.as_view(
template_name='registration/password_reset_confirm.html',
template_name="registration/password_reset_confirm.html",
),
name='password_reset_confirm',
name="password_reset_confirm",
),
path(
'reset/done/',
"reset/done/",
auth_views.PasswordResetCompleteView.as_view(
template_name='registration/password_reset_complete.html'
template_name="registration/password_reset_complete.html"
),
name='password_reset_complete',
name="password_reset_complete",
),
path(
"api/audit-account/",
include(
"applications.audit_account.api.urls"
)
),

] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
Loading
Loading