Skip to content

Commit

Permalink
precommit issue rectified
Browse files Browse the repository at this point in the history
  • Loading branch information
RamakrishnaVellala committed May 15, 2024
1 parent 87d8c95 commit a40d7d7
Show file tree
Hide file tree
Showing 13 changed files with 253 additions and 236 deletions.
4 changes: 1 addition & 3 deletions g2p_self_service_portal/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -514,9 +514,7 @@ 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)]
)
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]
Expand Down
28 changes: 14 additions & 14 deletions g2p_self_service_portal/views/g2p_self_service_aboutus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
10 changes: 7 additions & 3 deletions g2p_self_service_portal/views/g2p_self_service_allprograms.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
/>
Expand Down
204 changes: 97 additions & 107 deletions g2p_self_service_portal/views/g2p_self_service_base.xml
Original file line number Diff line number Diff line change
@@ -1,197 +1,187 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<!-- TODO: Remove all hardcoding -->
<template
<template
id="base"
name="G2P Self Service Portal Base"
inherit_id="web.frontend_layout"
priority="900"
primary="True"
>

<xpath expr="//header" position="replace">
<link
rel="stylesheet"
href="/g2p_self_service_portal/static/src/css/self_service_portal.css"
/>
<script src="https://cdn.jsdelivr.net/npm/chart.js" />
<header t-if="not no_header" id="top" data-anchor="true">
<div class="header-container">
<div class="nav">
<a href="/selfservice">
<img
<xpath expr="//header" position="replace">
<link rel="stylesheet" href="/g2p_self_service_portal/static/src/css/self_service_portal.css" />
<script src="https://cdn.jsdelivr.net/npm/chart.js" />
<header t-if="not no_header" id="top" data-anchor="true">
<div class="header-container">
<div class="nav">
<a href="/selfservice">
<img
src="/g2p_self_service_portal/static/src/img/[email protected]"
class="main-logo"
/>
</a>
<div class="nav-user">
<div class="search-box">
<svg
</a>
<div class="nav-user">
<div class="search-box">
<svg
xmlns="http://www.w3.org/2000/svg"
width="13.6"
height="13.6"
fill="currentColor"
class="bi bi-search search-icon"
viewBox="0 0 16 16"
>
<path
<path
d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"
/>
</svg>
<input placeholder="Search here" class="search-text" />
</svg>
<input placeholder="Search here" class="search-text" />

</div>
<div class="language-dropdown language-box">
<button
</div>
<div class="language-dropdown language-box">
<button
class="dropdown-toggle button"
type="button"
id="language-dropdown-button"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
>
<img
<img
src="/g2p_self_service_portal/static/src/img/flag_en.png"
alt="English"
class="flag"
/>
<span>English</span>
</button>
<div class="dropdown-menu" aria-labelledby="language-dropdown-button">
<a
<span>English</span>
</button>
<div class="dropdown-menu" aria-labelledby="language-dropdown-button">
<a
class="dropdown-item"
href="/website/lang/en?r=/selfservice"
data-url_code="en"
>
<img
<img
src="/g2p_self_service_portal/static/src/img/flag_en.png"
alt="English"
class="flag"
/>
<span>English</span>
</a>
<a
<span>English</span>
</a>
<a
class="dropdown-item"
href="/website/lang/fr?r=/selfservice"
data-url_code="fr"
>
<img
<img
src="/g2p_self_service_portal/static/src/img/FR.png"
alt="Français"
class="flag"
/>
<span>Français</span>
</a>
<a
<span>Français</span>
</a>
<a
class="dropdown-item"
href="/website/lang/tl?r=/selfservice"
data-url_code="tl"
>
<img
<img
src="/g2p_self_service_portal/static/src/img/flag_ph.png"
alt="Filipino"
class="flag"
/>
<span>Filipino</span>
</a>
</div>
</div>
<div class="dropdown user">
<a
<span>Filipino</span>
</a>
</div>
</div>
<div class="dropdown user">
<a
class="nav-link py-0 text-dark d-inline-block dropdown-toggle"
href="#"
data-toggle="dropdown"
>
<img
<img
t-attf-src="/web/image?model=res.users&amp;field=avatar_128&amp;id={{request.env.uid}}"
alt="User"
class="rounded-circle o_user_avatar user-image"
/>
</a>
<div class="dropdown-menu user-block">
<ul style="padding:0px">
<li>
<a
href="/selfservice/myprofile"
class="link"
>My Profile</a>
</li>
<hr />
<li>
<a
</a>
<div class="dropdown-menu user-block">
<ul style="padding:0px">
<li>
<a href="/selfservice/myprofile" class="link">My Profile</a>
</li>
<hr />
<li>
<a
href="/web/session/logout?redirect=/selfservice/login"
class="link"
>Logout</a>
</li>
</li>

</ul>
</ul>


</div>
</div>
</div>
</div>
</div>
<script
</div>
</div>
<script
type="text/javascript"
src="/g2p_self_service_portal/static/src/js/self_service_language_selector.js"
/>
</header>
</xpath>
</header>
</xpath>

<xpath expr="//main" position="inside">
<div class="ssp-contact-us">
<div id="chat-bot" class="contact-us-message">
<h5>Hi <t t-out="request.env.user.given_name" />, how are you doing?</h5>
<p>I am here to assist you. Take a few minutes and lets connect!</p>
</div>
<div class="chat-assist-icon">
<a href="#" onclick="toggleChatBot()">
<img src="/g2p_self_service_portal/static/src/img/[email protected]" />
</a>
</div>
</div>
</xpath>
<xpath expr="//main" position="inside">
<div class="ssp-contact-us">
<div id="chat-bot" class="contact-us-message">
<h5>Hi <t t-out="request.env.user.given_name" />
, how are you doing?</h5>
<p>I am here to assist you. Take a few minutes and lets connect!</p>
</div>
<div class="chat-assist-icon">
<a href="#" onclick="toggleChatBot()">
<img src="/g2p_self_service_portal/static/src/img/[email protected]" />
</a>
</div>
</div>
</xpath>

<xpath expr="//footer" position="replace">
<footer
t-if="not no_footer"
id="bottom"
data-anchor="true"
t-attf-class="bg-light o_footer"
>
<div class="footer-container">
<div class="nav">
<a href="/selfservice">
<img
<xpath expr="//footer" position="replace">
<footer t-if="not no_footer" id="bottom" data-anchor="true" t-attf-class="bg-light o_footer">
<div class="footer-container">
<div class="nav">
<a href="/selfservice">
<img
src="/g2p_self_service_portal/static/src/img/[email protected]"
class="main-logo"
/>
</a>
<ul class='list-container'>
<li class="nav-item">
<a
</a>
<ul class='list-container'>
<li class="nav-item">
<a
class="nav-link link"
aria-current="page"
href="/selfservice/aboutus"
>About Us</a>
</li>
<li class="nav-item">
<a class="nav-link link" href="/selfservice/contactus">Contact Us</a>
</li>
<li class="nav-item">
<a class="nav-link link" href="/selfservice/otherpage">Others</a>
</li>
</ul>
</li>
<li class="nav-item">
<a class="nav-link link" href="/selfservice/contactus">Contact Us</a>
</li>
<li class="nav-item">
<a class="nav-link link" href="/selfservice/otherpage">Others</a>
</li>
</ul>

</div>
<hr />
<div class="copyright">
<p>© 2023 National Social Benefits Portal. All rights reserved.</p>
</div>
</div>
<hr />
<div class="copyright">
<p>© 2023 National Social Benefits Portal. All rights reserved.</p>
</div>

</div>
</footer>
</xpath>
</template>
</div>
</footer>
</xpath>
</template>
</odoo>
Loading

0 comments on commit a40d7d7

Please sign in to comment.