Skip to content

Commit 7c51de4

Browse files
gonzalesedwin1123gonzalesedwin1123
committed
Fix UI layout for validators
1 parent 3df8561 commit 7c51de4

File tree

2 files changed

+99
-95
lines changed

2 files changed

+99
-95
lines changed

‎spp_change_request/static/src/scss/change_request.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616

1717
.o_container_right {
1818
margin-left: 10px !important;
19+
margin-right: 10px !important;
1920
}
2021

2122
.o_container_left {
23+
background: rgba(255, 255, 255, 0) !important;
2224
margin-left: 10px !important;
2325
margin-right: 10px !important;
2426
}

‎spp_change_request_add_children_demo/views/change_request_add_children_view.xml‎

Lines changed: 97 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -424,76 +424,77 @@
424424
statusbar_visible="draft,pending,validated,applied"
425425
/>
426426
</header>
427+
<sheet>
427428
<!-- Form Body -->
428429
<div class="oe_button_box" name="button_box">
429430
</div>
430431
<group colspan="4" col="4">
431432
<!-- Left Panel -->
432-
<group colspan="2" col="4" class="o_left_panel">
433-
<div class="o_header_label1">
433+
<group colspan="2" col="2" class="o_left_panel">
434+
<div class="o_header_label1" colspan="2">
434435
<label for="registrant_id" string="ADD CHILD/MEMBER TO GROUP:" />
435436
<h2>
436437
<field name="registrant_id" readonly="1" options="{'no_open':True}" />
437438
<button
438-
name="open_registrant_details_form"
439-
type="object"
440-
string="Open Details"
441-
icon="fa-external-link "
442-
class="btn-success"
443-
style="margin-left: 10px;"
444-
invisible="not registrant_id"
445-
/>
439+
name="open_registrant_details_form"
440+
type="object"
441+
string="Open Details"
442+
icon="fa-external-link "
443+
class="btn-success"
444+
style="margin-left: 10px;"
445+
invisible="not registrant_id"
446+
/>
446447
</h2>
447448
</div>
448449
<newline />
449450
<notebook colspan="2" class="o_container_left">
450451
<page string="TARGET GROUP INFORMATION">
451-
<group colspan="4" col="4" name="target_group">
452-
<field name="group_address" colspan="4" />
453-
<field name="group_registration_date" />
452+
<group colspan="2" col="2" name="target_group">
453+
<field name="group_address" colspan="2" string="Address:" />
454+
<field name="group_registration_date" string="Registration Date:" />
454455
</group>
455456
<group
456-
colspan="4"
457-
col="4"
458-
string="Current Group Members"
459-
name="group_members"
460-
>
461-
<field name="group_member_ids" readonly="1" nolabel="1" colspan="4">
457+
colspan="2"
458+
col="2"
459+
string="Current Group Members"
460+
name="group_members"
461+
>
462+
<field name="group_member_ids" readonly="1" nolabel="1" colspan="2">
462463
<tree>
463464
<button
464-
name="open_individual_form"
465-
type="object"
466-
help="Open Member Form"
467-
icon="fa-external-link "
468-
class="btn-success"
469-
/>
470-
<field name="group_add_children_id" invisible="1" />
465+
name="open_individual_form"
466+
type="object"
467+
help="Open Member Form"
468+
icon="fa-external-link "
469+
class="btn-success"
470+
/>
471+
<field name="group_add_children_id" column_invisible="1" />
471472
<field name="individual_id" string="Members" />
472473
<field
473-
name="kind_ids"
474-
widget="many2many_tags"
475-
options="{'no_open':True}"
476-
/>
474+
name="kind_ids"
475+
widget="many2many_tags"
476+
options="{'no_open':True}"
477+
/>
477478
</tree>
478479
<form string="Group Membership">
479480
<sheet>
480481
<div class="oe_title mb24">
481482
<h1>
482483
<field
483-
name="individual_id"
484-
string="Member"
485-
options="{'no_open':True}"
486-
readonly="1"
487-
/>
484+
name="individual_id"
485+
string="Member"
486+
options="{'no_open':True}"
487+
readonly="1"
488+
/>
488489
</h1>
489490
<div class="o_row">
490491
<label for="kind_ids" string="Membership Types:" />
491492
<field
492-
name="kind_ids"
493-
widget="many2many_tags"
494-
options="{'no_open':True}"
495-
readonly="1"
496-
/>
493+
name="kind_ids"
494+
widget="many2many_tags"
495+
options="{'no_open':True}"
496+
readonly="1"
497+
/>
497498
</div>
498499
</div>
499500
<group colspan="4" col="4">
@@ -510,8 +511,8 @@
510511
</notebook>
511512
</group>
512513
<!-- Right Panel -->
513-
<group colspan="2" col="4" class="o_right_panel">
514-
<div class="o_header_label1">
514+
<group colspan="2" col="2" class="o_right_panel">
515+
<div class="o_header_label1" colspan="2">
515516
<label for="request_type" string="Request Type:" />
516517
<h2>
517518
<field name="request_type" readonly="1" />
@@ -520,28 +521,28 @@
520521
<newline />
521522
<notebook colspan="2" class="o_container_right">
522523
<page string="Request Details">
523-
<group colspan="4" col="4" string="Applicant Information">
524+
<group colspan="2" col="2" string="Applicant Information">
524525
<field
525-
name="applicant_id"
526-
options="{'no_create': True,'no_open':True}"
527-
readonly="1"
528-
/>
526+
name="applicant_id"
527+
options="{'no_create': True,'no_open':True}"
528+
readonly="1"
529+
/>
529530
<button
530-
name="open_applicant_details_form"
531-
type="object"
532-
icon="fa-external-link"
533-
class="btn-success"
534-
invisible="not applicant_id"
535-
style="margin-left: 10px;"
536-
colspan="2"
537-
/>
531+
name="open_applicant_details_form"
532+
type="object"
533+
icon="fa-external-link"
534+
class="btn-success"
535+
invisible="not applicant_id"
536+
style="margin-left: 10px;"
537+
colspan="2"
538+
/>
538539
<field
539-
name="applicant_phone"
540-
string="Phone No."
541-
readonly="1"
542-
widget="phone"
543-
options="{'enable_sms': false}"
544-
/>
540+
name="applicant_phone"
541+
string="Phone No."
542+
readonly="1"
543+
widget="phone"
544+
options="{'enable_sms': false}"
545+
/>
545546
</group>
546547
<group colspan="4" col="4" string="New Information">
547548
<field name="full_name" readonly="1" colspan="4" class="oe_read_only" />
@@ -550,40 +551,41 @@
550551
<field name="addl_name" readonly="1" class="oe_edit_only" />
551552
<field name="gender" readonly="1" />
552553
<field
553-
name="phone"
554-
readonly="1"
555-
widget="phone"
556-
options="{'enable_sms': false}"
557-
/>
554+
name="phone"
555+
readonly="1"
556+
widget="phone"
557+
options="{'enable_sms': false}"
558+
/>
558559
<field name="uid_number" readonly="1" />
560+
<newline />
559561
<field name="birth_place" colspan="4" readonly="1" />
560562
<field name="birthdate_not_exact" readonly="1" />
561563
<field name="birthdate" readonly="1" />
562564
<field
563-
name="kind"
564-
widget="many2many_tags"
565-
options="{'no_open':True}"
566-
colspan="4"
567-
readonly="1"
568-
/>
565+
name="kind"
566+
widget="many2many_tags"
567+
options="{'no_open':True}"
568+
colspan="4"
569+
readonly="1"
570+
/>
569571
</group>
570572
</page>
571573
<page string="Attachments">
572574
<field
573-
name="dms_file_ids"
574-
readonly="1"
575-
nolabel="1"
576-
context="{'form_view_ref':'spp_change_request.view_dms_file_spp_custom_form'}"
577-
>
575+
name="dms_file_ids"
576+
readonly="1"
577+
nolabel="1"
578+
context="{'form_view_ref':'spp_change_request.view_dms_file_spp_custom_form'}"
579+
>
578580
<tree js_class="file_list" multi_edit="1" create="0">
579581
<field name="name" column_invisible="1" />
580582
<field
581-
name="content"
582-
filename="name"
583-
mimetype="mimetype"
584-
widget="preview_binary"
585-
string="File"
586-
/>
583+
name="content"
584+
filename="name"
585+
mimetype="mimetype"
586+
widget="preview_binary"
587+
string="File"
588+
/>
587589
<field name="category_id" />
588590
<field name="directory_id" />
589591
<field name="mimetype" column_invisible="1" />
@@ -595,27 +597,27 @@
595597
<page string="Other Information">
596598
<group colspan="4" col="4">
597599
<field
598-
name="change_request_id"
599-
string="Request No."
600-
readonly="1"
601-
options="{'no_open':True}"
602-
colspan="4"
603-
/>
600+
name="change_request_id"
601+
string="Request No."
602+
readonly="1"
603+
options="{'no_open':True}"
604+
colspan="4"
605+
/>
604606
<field
605-
name="assign_to_id"
606-
string="Assigned To"
607-
options="{'no_open':True}"
608-
readonly="1"
609-
/>
607+
name="assign_to_id"
608+
string="Assigned To"
609+
options="{'no_open':True}"
610+
readonly="1"
611+
/>
610612
<field name="current_user_assigned" invisible="1" colspan="4" />
611613
<field name="last_validated_by_id" readonly="1" />
612614
<field name="date_validated" readonly="1" />
613615
</group>
614616
</page>
615617
</notebook>
616618
</group>
617-
618619
</group>
620+
</sheet>
619621
</form>
620622
</field>
621623
</record>

0 commit comments

Comments
 (0)