Merge pull request #107 from RamakrishnaVellala/15.0-1.1.0

G2P-2344 Odoo15_SSP_Past submission list_View button is added
OpenG2P · May 15, 2024 · 25d777f · 25d777f
2 parents dba88c6 + a40d7d7
commit 25d777f
Show file tree

Hide file tree

Showing 14 changed files with 273 additions and 234 deletions.
diff --git a/g2p_self_service_portal/controllers/main.py b/g2p_self_service_portal/controllers/main.py
@@ -347,6 +347,7 @@ def self_service_all_submissions(self, _id):
                 {
                     "applied_on": detail.create_date.strftime("%d-%b-%Y"),
                     "application_id": detail.application_id,
+                    "program_id": program.id,
                     "status": detail.state
                     if detail.program_membership_id.state not in ("duplicated", "not_eligible")
                     else detail.program_membership_id.state,
@@ -496,6 +497,7 @@ def self_service_form_submit(self, _id, **kwargs):
     )
     def self_service_form_details(self, _id, **kwargs):
         self.self_service_check_roles("REGISTRANT")
+        application_id = request.params.get("application_id", None)
 
         program = request.env["g2p.program"].sudo().browse(_id)
         current_partner = request.env.user.partner_id
@@ -511,6 +513,8 @@ def self_service_form_details(self, _id, **kwargs):
             )
             .sorted("create_date", reverse=True)
         )
+        if application_id:
+            program_reg_info = program_reg_info.sudo().search([("application_id", "=", application_id)])
 
         if len(program_reg_info) > 1:
             program_reg_info = program_reg_info[0]

diff --git a/g2p_self_service_portal/views/g2p_self_service_aboutus.xml b/g2p_self_service_portal/views/g2p_self_service_aboutus.xml
@@ -5,25 +5,25 @@
             <t t-set="title"> About Us| Self Service Portal</t>
             <div class="main-container">
                 <div class="container-adjuster">
-                <h5 class='all-title'>About Us</h5>
-                <ol class="breadcrumb  breadcrumb-list bg-transparent">
-                    <li class="breadcrumb-item">
-                        <a href="/selfservice">Home</a>
-                    </li>
-                    <li class="breadcrumb-item active" aria-current="page">About Us</li>
-                </ol>
+                    <h5 class='all-title'>About Us</h5>
+                    <ol class="breadcrumb  breadcrumb-list bg-transparent">
+                        <li class="breadcrumb-item">
+                            <a href="/selfservice">Home</a>
+                        </li>
+                        <li class="breadcrumb-item active" aria-current="page">About Us</li>
+                    </ol>
 
-                <div class="profile-container">
-                    <img src="/g2p_self_service_portal/static/src/img/page_under_construction.png" />
-                    <div>
-                        <h1>Page Under Construction!</h1>
-                        <p
+                    <div class="profile-container">
+                        <img src="/g2p_self_service_portal/static/src/img/page_under_construction.png" />
+                        <div>
+                            <h1>Page Under Construction!</h1>
+                            <p
                             >Our experts are working hard to make this page available. Meanwhile, we request you to please visit after some time.</p>
-                    </div>
+                        </div>
 
+                    </div>
                 </div>
             </div>
-            </div>
         </t>
     </template>
 </odoo>
diff --git a/g2p_self_service_portal/views/g2p_self_service_allprograms.xml b/g2p_self_service_portal/views/g2p_self_service_allprograms.xml
@@ -48,8 +48,10 @@
                                 <thead>
                                     <tr>
                                         <th>No.</th>
-                                        <th>Program Name <i class="fa fa-sort" /></th>
-                                        <th>Status <i class="fa fa-sort" /></th>
+                                        <th>Program Name <i class="fa fa-sort" />
+                                        </th>
+                                        <th>Status <i class="fa fa-sort" />
+                                        </th>
                                         <th>Actions</th>
                                     </tr>
                                 </thead>
@@ -100,7 +102,9 @@
                                                             <h5
                                                                 class="modal-title"
                                                                 id="exampleModalLongTitle"
-                                                            ><t t-out="program['name']" /></h5>
+                                                            >
+                                                                <t t-out="program['name']" />
+                                                            </h5>
                                                             <button
                                                                 type="button"
                                                                 class="close"

diff --git a/g2p_self_service_portal/views/g2p_self_service_authentication.xml b/g2p_self_service_portal/views/g2p_self_service_authentication.xml
@@ -66,7 +66,8 @@
                         </p>
 
                         <div id="otp-timer">
-                            <span>Time remaining <b>02:00</b></span>
+                            <span>Time remaining <b>02:00</b>
+                            </span>
                             <a
                                 style="float:right; pointer-events: none; color: #ADB5BD;"
                                 t-attf-href="/selfservice/signup/otp"
@@ -80,8 +81,9 @@
                         </div>
                     </form>
                 </div>
-                <div class="login-bottom-text"> Facing any challenges? <a href="#">Help</a> </div>
-            <script
+                <div class="login-bottom-text"> Facing any challenges? <a href="#">Help</a>
+                </div>
+                <script
                     type="text/javascript"
                     src="/g2p_self_service_portal/static/src/js/self_service_signup_authentication.js"
                 />