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

Added new fields in group templates and fixed issues in the controller. #246

Open
wants to merge 5 commits into
base: 17.0-1.4
Choose a base branch
from
Open

Added new fields in group templates and fixed issues in the controller. #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e655a92
Added fields in group template
Q-Niranjan Jan 29, 2025
1f3c24f
Added new fields in households form
Q-Niranjan Jan 30, 2025
6ff00ed
Change in gender label
Q-Niranjan Feb 5, 2025
a602df2
Fix the name issue
Q-Niranjan Feb 13, 2025
0e73924
Change in address field
Q-Niranjan Feb 13, 2025
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
89 changes: 66 additions & 23 deletions g2p_registration_portal_base/controllers/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import json
import logging
from datetime import date

from odoo import http
from odoo.http import request
Expand Down Expand Up @@ -65,7 +66,7 @@ def group_create_submit(self, **kw):
beneficiary_id = None
# Group creation
if kw.get("group_id"):
beneficiary_id = request.env["res.partner"].sudo().browse(int(kw.get("group_id")))
beneficiary_id = request.env["res.partner"].sudo().browse(int(kw.get("group_id"))).id
else:
if head_name:
user = request.env.user
Expand All @@ -74,7 +75,7 @@ def group_create_submit(self, **kw):
"name": head_name,
"is_registrant": True,
"is_group": True,
"birthdate": kw.get("dob"),
"birthdate": kw.get("birthdate"),
"gender": kw.get("gender"),
"user_id": user.id,
}
Expand Down Expand Up @@ -185,7 +186,8 @@ def group_submit(self, **kw):
def individual_create(self, **kw):
res = dict()
try:
head_name = kw.get("household_name")
user = request.env.user
head_name = kw.get("Household_name")
head_individual = None
# Group creation
if kw.get("group_id"):
Expand All @@ -195,7 +197,9 @@ def individual_create(self, **kw):
group_rec = (
request.env["res.partner"]
.sudo()
.create({"name": head_name, "is_registrant": True, "is_group": True})
.create(
{"name": head_name, "is_registrant": True, "is_group": True, "user_id": user.id}
)
)
# Head creation
head_name_parts = head_name.split(" ")
Expand All @@ -219,15 +223,17 @@ def individual_create(self, **kw):
"addl_name": h_addl_name,
"family_name": h_family_name,
"birthdate": kw.get("Household_dob"),
"gender": kw.get("Househol_gender"),
"gender": kw.get("Household_gender"),
"email": kw.get("Household_email"),
"address": kw.get("Household_address"),
"user_id": user.id,
}
)
)

given_name = kw.get("given_name")
family_name = kw.get("family_name")
addl_name = kw.get("addl_name")
user = request.env.user

name = f"{given_name}, {addl_name} {family_name}"

Expand All @@ -236,8 +242,10 @@ def individual_create(self, **kw):
"given_name": given_name,
"family_name": family_name,
"addl_name": addl_name,
"birthdate": kw.get("birthdate"),
"birthdate": kw.get("dob"),
"gender": kw.get("gender"),
"email": kw.get("email"),
"address": kw.get("address"),
"is_registrant": True,
"is_group": False,
"user_id": user.id,
Expand All @@ -262,11 +270,17 @@ def individual_create(self, **kw):

member_list = []
for membership in group_rec.group_membership_ids:
age = 0
dob = membership.individual.birthdate
if dob:
today = date.today()
age = today.year - dob.year - ((today.month, today.day) < (dob.month, dob.day))

member_list.append(
{
"id": membership.individual.id,
"name": membership.individual.name,
"age": membership.individual.age,
"age": age,
"gender": membership.individual.gender,
"active": membership.individual.active,
"group_id": membership.group.id,
Expand All @@ -290,13 +304,16 @@ def update_member(self, **kw):
member_id = kw.get("member_id")
try:
beneficiary = request.env["res.partner"].sudo().browse(int(member_id))

if beneficiary:
exist_value = {
"given_name": beneficiary.given_name,
"addl_name": beneficiary.addl_name,
"family_name": beneficiary.family_name,
"dob": str(beneficiary.birthdate),
"gender": beneficiary.gender,
"email": beneficiary.email,
"address": beneficiary.address,
"id": beneficiary.id,
}
return json.dumps(exist_value)
Expand Down Expand Up @@ -331,17 +348,25 @@ def update_member_submit(self, **kw):
"family_name": family_name,
"birthdate": kw.get("birthdate"),
"gender": kw.get("gender"),
"email": kw.get("email"),
"address": kw.get("address"),
}
)
# group = request.env["res.partner"].sudo().browse(int(kw.get("group_id")))
member_list = []

for membership in member:
age = 0
dob = membership.birthdate
if dob:
today = date.today()
age = today.year - dob.year - ((today.month, today.day) < (dob.month, dob.day))

member_list.append(
{
"id": membership.id,
"name": membership.name,
"age": membership.age,
"age": age,
"gender": membership.gender,
"active": membership.active,
}
Expand Down Expand Up @@ -411,20 +436,30 @@ def individual_create_submit(self, **kw):
else:
birthdate = kw.get("birthdate")

request.env["res.partner"].sudo().create(
{
"given_name": kw.get("given_name"),
"addl_name": kw.get("addl_name"),
"family_name": kw.get("family_name"),
"name": name,
"birthdate": birthdate,
"gender": kw.get("gender"),
"email": kw.get("email"),
"user_id": user.id,
"is_registrant": True,
"is_group": False,
}
registrant = (
request.env["res.partner"]
.sudo()
.create(
{
"given_name": kw.get("given_name"),
"addl_name": kw.get("addl_name"),
"family_name": kw.get("family_name"),
"name": name,
"birthdate": birthdate,
"gender": kw.get("gender"),
"email": kw.get("email"),
"user_id": user.id,
"is_registrant": True,
"is_group": False,
}
)
)
for key, value in kw.items():
if key in registrant:
registrant.write({key: value})
else:
_logger.error(f"Ignoring invalid key: {key}")

return request.redirect("/portal/registration/individual")

except Exception as e:
Expand Down Expand Up @@ -487,7 +522,7 @@ def update_individual_submit(self, **kw):
else:
birthdate = kw.get("birthdate")

member.sudo().write(
member = member.sudo().write(
{
"given_name": kw.get("given_name"),
"addl_name": kw.get("addl_name"),
Expand All @@ -496,8 +531,16 @@ def update_individual_submit(self, **kw):
"birthdate": birthdate,
"gender": kw.get("gender"),
"email": kw.get("email"),
"address": kw.get("address"),
}
)

for key, value in kw.items():
if key in member:
member.write({key: value})
else:
_logger.error(f"Ignoring invalid key: {key}")

return request.redirect("/portal/registration/individual")

except Exception as e:
Expand Down
7 changes: 6 additions & 1 deletion g2p_registration_portal_base/static/src/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@
opacity: 1;
}

.table-container table td {
text-align: left;
vertical-align: middle;
padding-left: 10px;
}
.table-head-container .search-box {
width: 273px;
height: 40px;
Expand Down Expand Up @@ -1886,7 +1891,7 @@ li div p {
}
#memberDetailModal .modal-dialog {
max-width: 800px;
max-height: 400px;
max-height: 600px;
}
.active-logo {
width: 20px;
Expand Down
24 changes: 19 additions & 5 deletions g2p_registration_portal_base/static/src/js/member_form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ $(document).on("click", "#member_submit", function () {
var group = $("input[name='group_id']").val();
var Householdname = $("#name").val();
var Householddob = $("#birthdate").val();
var Householgender = $("select[name='gender']").val();
var Householdgender = $("select[name='gender']").val();
var Householdemail = $("#email").val();
var Householdaddress = $("#address").val();
var firstName = $("#memberDetailModal #given_name").val();
var middleName = $("#memberDetailModal #addl_name").val();
var lastName = $("#memberDetailModal #family_name").val();
Expand All @@ -90,6 +92,8 @@ $(document).on("click", "#member_submit", function () {
var relationship = $('#memberDetailModal select[name="relationship"]').val();
var isValid = true;
var modal = $("#memberDetailModal");
var email = $("#memberDetailModal #email").val();
var address = $("#memberDetailModal #address").val();

$(".form-control, .form-select").removeClass("is-invalid");

Expand All @@ -115,15 +119,19 @@ $(document).on("click", "#member_submit", function () {
method: "POST",
data: {
group_id: group,
household_name: Householdname,
Household_name: Householdname,
Household_dob: Householddob,
Househol_gender: Householgender,
given_name: firstName,
family_name: middleName,
Household_gender: Householdgender,
Household_email: Householdemail,
Household_address: Householdaddress,
family_name: firstName,
given_name: middleName,
addl_name: lastName,
dob: dob,
gender: gender,
relationship: relationship,
email: email,
address: address,
},
dataType: "json",
success: function (response) {
Expand Down Expand Up @@ -207,6 +215,8 @@ $(document).on("click", "#mem-update", function () {
modal.find("#family_name").val(response.family_name);
modal.find("#birthdate").val(response.dob);
modal.find('select[name="gender"]').val(response.gender);
modal.find("#email").val(response.email);
modal.find("#address").val(response.address);

$("#member_submit").replaceWith(
'<div id="update-member-btn" store="' +
Expand Down Expand Up @@ -234,6 +244,8 @@ $(document).on("click", "#update-member-btn", function () {
var dob = $("#memberDetailModal #birthdate").val();
var gender = $('#memberDetailModal select[name="gender"]').val();
var isValid = true;
var address = $("#memberDetailModal #address").val();
var email = $("#memberDetailModal #email").val();

$(".form-control, .form-select").removeClass("is-invalid");

Expand Down Expand Up @@ -262,6 +274,8 @@ $(document).on("click", "#update-member-btn", function () {
family_name: lastName,
birthdate: dob,
gender: gender,
address: address,
email: email,
},
dataType: "json",
success: function (response) {
Expand Down
4 changes: 2 additions & 2 deletions g2p_registration_portal_base/tests/test_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ def test_individual_create(self):
response = self.url_open(
"/portal/registration/member/create/",
data={
"household_name": "GIVEN ADDL FAMILY",
"Household_name": "GIVEN FAMILY ADDL",
"Household_dob": "2023-01-01",
"Househol_gender": self.gender.value,
"Household_gender": self.gender.value,
"given_name": "Individual",
"family_name": "One",
"birthdate": "2024-01-01",
Expand Down
Loading
Loading