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

Release #1555

Merged
merged 69 commits into from
Nov 13, 2023
Merged

Release #1555

Changes from 2 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
2d7152f
changing routing import after django setup
jelanmathewjames Nov 3, 2023
e512f97
Merge branch 'gtech-mulearn:dev' into dev
jelanmathewjames Nov 3, 2023
75c9512
[PATCH] Minor patch
MZaFaRM Nov 3, 2023
3177cc5
optim:LearningCircleMainApi
anirudh-mk Nov 4, 2023
13f6d63
optim:LearningCircleDataAPI
anirudh-mk Nov 4, 2023
e9f04d3
optim:LearningCircleListMembersApi
anirudh-mk Nov 4, 2023
189ded7
optim:LearningCircleJoinSerializer
anirudh-mk Nov 4, 2023
67008e5
Merge pull request #1515 from anirudh-mk/dev
Nov 4, 2023
d3ced79
optim:LearningCircleHomeSerializer
anirudh-mk Nov 4, 2023
b56f3c6
optim:MeetGetPostPatchDeleteAPI
anirudh-mk Nov 4, 2023
f6a35a8
optim:LearningCircleInviteMemberAPI
anirudh-mk Nov 4, 2023
3be9daa
optim:lc
anirudh-mk Nov 4, 2023
8449c5b
Merge remote-tracking branch 'origin/dev' into dev
anirudh-mk Nov 4, 2023
e69dac9
fix(lc create api)
anirudh-mk Nov 4, 2023
7ad8b29
Merge pull request #1519 from anirudh-mk/dev
Nov 4, 2023
8c9a39f
Merge pull request #1520 from gtech-mulearn/dev
Nov 4, 2023
6ac6838
[FEAT] ws group send for landing-stats
jelanmathewjames Nov 5, 2023
a9e67dd
Merge branch 'dev' into dev
jelanmathewjames Nov 5, 2023
ac27545
feat(profile) : profile picture upload
aswanthabam Nov 5, 2023
c0edcde
Merge pull request #1522 from aswanthabam/dev
Nov 5, 2023
e42d505
Merge pull request #1523 from gtech-mulearn/dev
Nov 5, 2023
bef75e1
refactor(task): change base template name
lordgrim18 Nov 5, 2023
4793a67
refactor(karma_voucher): change base template name
lordgrim18 Nov 5, 2023
9d9c488
fix(task): channel endpoint
lordgrim18 Nov 5, 2023
6e21e20
feat : profile picture upload : image url
aswanthabam Nov 5, 2023
e05cbab
Merge pull request #1524 from lordgrim18/dev
Nov 5, 2023
fde55df
feat : profile picture upload (url updated)
aswanthabam Nov 5, 2023
2500b1c
Merge pull request #1525 from gtech-mulearn/dev
Nov 5, 2023
a6ffc28
fix : profile pic upload
aswanthabam Nov 5, 2023
8522ce5
Merge pull request #1526 from aswanthabam/dev
Nov 5, 2023
8fbf288
Merge pull request #1527 from gtech-mulearn/dev
Nov 5, 2023
194d67c
Merge branch 'gtech-mulearn:dev' into dev
jelanmathewjames Nov 6, 2023
6f001dc
[FEAT] user deletion start
MZaFaRM Nov 6, 2023
ab79ad5
Merge branch 'dev-server' of https://github.com/gtech-mulearn/mulearn…
MZaFaRM Nov 6, 2023
40bac5d
Merge pull request #1528 from MZaFaRM:dev
MZaFaRM Nov 6, 2023
4f0793c
Merge pull request #1529 from gtech-mulearn:dev
MZaFaRM Nov 6, 2023
f673040
[FEAT] Remove active column
MZaFaRM Nov 6, 2023
4117c94
Merge branch 'dev-server' of https://github.com/gtech-mulearn/mulearn…
MZaFaRM Nov 6, 2023
ba652b5
[FEAT] remove reference to active column
MZaFaRM Nov 6, 2023
5f5b9f3
Merge pull request #1530 from MZaFaRM:dev
MZaFaRM Nov 6, 2023
3d45060
Merge pull request #1531 from gtech-mulearn:dev
MZaFaRM Nov 6, 2023
9d2abe8
[FEAT] Add user manager
MZaFaRM Nov 6, 2023
42cbd10
Merge branch 'dev-server' of https://github.com/gtech-mulearn/mulearn…
MZaFaRM Nov 6, 2023
2413046
Merge pull request #1532 from MZaFaRM:dev
MZaFaRM Nov 6, 2023
f6f8fd9
Merge pull request #1533 from gtech-mulearn:dev
MZaFaRM Nov 6, 2023
d20efb5
first commit
SurajSuresh123 Nov 6, 2023
dcbbce6
second commit
SurajSuresh123 Nov 6, 2023
d1f871e
feat(organization models):OrgKarmaType and OrgKarmLog added
anirudh-mk Nov 6, 2023
79a16d4
Merge pull request #1535 from anirudh-mk/dev
Nov 6, 2023
08743f3
fix : profile picture upload (url)
aswanthabam Nov 6, 2023
ff53193
Merge pull request #1534 from SurajSuresh123/dev
MZaFaRM Nov 6, 2023
55fc7eb
Merge pull request #1537 from gtech-mulearn/dev
MZaFaRM Nov 6, 2023
c636ed8
[DELETE] Unecessary files
MZaFaRM Nov 6, 2023
a74996e
Merge pull request #1538 from MZaFaRM/dev
MZaFaRM Nov 6, 2023
0325174
Merge pull request #1539 from gtech-mulearn/dev
MZaFaRM Nov 6, 2023
962959e
Merge pull request #1536 from aswanthabam/dev
Nov 7, 2023
9c1aff9
Merge pull request #1540 from gtech-mulearn/dev
Nov 7, 2023
d9bc393
[PATCH] Remove more instances of user active
MZaFaRM Nov 7, 2023
19e432e
Merge pull request #1541 from MZaFaRM:dev
MZaFaRM Nov 7, 2023
5df9c10
Merge pull request #1542 from gtech-mulearn:dev
MZaFaRM Nov 7, 2023
255c7e2
feat(organization models):OrgKarmaType and OrgKarmLog added
anirudh-mk Nov 7, 2023
a75164d
fix(task): column name in csv generator api
lordgrim18 Nov 8, 2023
03baaec
Merge pull request #1544 from lordgrim18/dev
Nov 8, 2023
9a99b7e
Merge pull request #1521 from jelanmathewjames/dev
adnankattekaden Nov 8, 2023
364450f
Merge pull request #1545 from gtech-mulearn/dev
adnankattekaden Nov 8, 2023
4097caa
third commit
SurajSuresh123 Nov 8, 2023
1eb7083
Merge pull request #1543 from anirudh-mk/dev
Nov 8, 2023
e363bb8
Merge pull request #1546 from SurajSuresh123/dev
adnankattekaden Nov 8, 2023
95b824b
Merge pull request #1547 from gtech-mulearn/dev
adnankattekaden Nov 8, 2023
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
48 changes: 47 additions & 1 deletion api/dashboard/organisation/organisation_views.py
Original file line number Diff line number Diff line change
@@ -19,7 +19,8 @@
InstitutionCreateUpdateSerializer,
InstitutionSerializer,
InstitutionPrefillSerializer,
OrganizationMergerSerializer,
OrganizationMergerSerializer, OrganizationKarmaTypeGetPostPatchDeleteSerializer,
OrganizationKarmaLogGetPostPatchDeleteSerializer,
)


@@ -470,3 +471,48 @@ def patch(self, request, organisation_id):
return CustomResponse(
general_message="An organization with the given id doesn't exist"
).get_failure_response()


class OrganizationKarmaTypeGetPostPatchDeleteAPI(APIView):
def post(self, request):
user_id = JWTUtils.fetch_user_id(request)

serializer = OrganizationKarmaTypeGetPostPatchDeleteSerializer(
data=request.data,
context={
'user_id': user_id
}
)
if serializer.is_valid():
serializer.save()

return CustomResponse(
"Organization karma type created successfully"
).get_success_response()

return CustomResponse(
serializer.errors
).get_failure_response()


class OrganizationKarmaLogGetPostPatchDeleteAPI(APIView):
def post(self, request):
user_id = JWTUtils.fetch_user_id(request)

serializer = OrganizationKarmaLogGetPostPatchDeleteSerializer(
data=request.data,
context={
'user_id': user_id
}
)

if serializer.is_valid():
serializer.save()

return CustomResponse(
"Organization karma Log created successfully"
).get_success_response()

return CustomResponse(
serializer.errors
).get_failure_response()
38 changes: 38 additions & 0 deletions api/dashboard/organisation/serializers.py
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@
State,
OrgAffiliation,
Department,
OrgKarmaType,
OrgKarmaLog,
)
from utils.permission import JWTUtils
from utils.types import OrganizationType
@@ -361,3 +363,39 @@ def update(self, instance, validated_data):
source_org.delete()

return instance


class OrganizationKarmaTypeGetPostPatchDeleteSerializer(serializers.ModelSerializer):

class Meta:
model = OrgKarmaType
fields = [
"title",
"karma",
"description",
]

def create(self, validated_data):
user_id = self.context.get("user_id")
validated_data["updated_by_id"] = user_id
validated_data["created_by_id"] = user_id

return OrgKarmaType.objects.create(**validated_data)


class OrganizationKarmaLogGetPostPatchDeleteSerializer(serializers.ModelSerializer):

class Meta:
model = OrgKarmaLog
fields = [
"org",
"karma",
"type",
]

def create(self, validated_data):
user_id = self.context.get("user_id")
validated_data["updated_by_id"] = user_id
validated_data["created_by_id"] = user_id

return OrgKarmaLog.objects.create(**validated_data)
4 changes: 3 additions & 1 deletion api/dashboard/organisation/urls.py
Original file line number Diff line number Diff line change
@@ -21,5 +21,7 @@
path('departments/edit/<str:department_id>/', organisation_views.DepartmentAPI.as_view()),
path('departments/delete/<str:department_id>/', organisation_views.DepartmentAPI.as_view()),
path('affiliation/list/', organisation_views.AffiliationListAPI.as_view()),
path('merge_organizations/<str:organisation_id>/', organisation_views.OrganizationMergerView.as_view())
path('merge_organizations/<str:organisation_id>/', organisation_views.OrganizationMergerView.as_view()),
path('karma-type/create/', organisation_views.OrganizationKarmaTypeGetPostPatchDeleteAPI.as_view()),
path('karma-log/create/', organisation_views.OrganizationKarmaLogGetPostPatchDeleteAPI.as_view()),
]