Skip to content
Extraits de code Groupes Projets
Valider 236a9647 rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament Validation de Rémi - Le Filament
Parcourir les fichiers

[update] add release number and update templates

parent a19957f4
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Afficher les modifications d'espaces
En ligne Côte à côte
models/res_partner_release.py
+ 8
− 0
Voir le fichier @ 236a9647
...@@ -49,6 +49,7 @@ class PartnerRelease(models.Model): ...@@ -49,6 +49,7 @@ class PartnerRelease(models.Model):
string="Lien de partage client", string="Lien de partage client",
compute="_compute_release_share_link", compute="_compute_release_share_link",
) )
release_number = fields.Integer(compute="_compute_release_number")
# ------------------------------------------------------ # ------------------------------------------------------
# SQL Constraints # SQL Constraints
...@@ -91,6 +92,13 @@ class PartnerRelease(models.Model): ...@@ -91,6 +92,13 @@ class PartnerRelease(models.Model):
else: else:
release.release_share_link = "" release.release_share_link = ""
def _compute_release_number(self):
for release in self:
release_ids = self.search(
[("partner_id", "=", release.partner_id.id)], order="release_date"
)
release.release_number = release_ids.ids.index(release.id) + 1
# ------------------------------------------------------ # ------------------------------------------------------
# Onchange / Constraints # Onchange / Constraints
# ------------------------------------------------------ # ------------------------------------------------------
......
models/res_partner_release_module.py
+ 1
− 5
Voir le fichier @ 236a9647
# Copyright 2022 Le Filament (https://le-filament.com) # Copyright 2022 Le Filament (https://le-filament.com)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
from odoo import fields, models from odoo import fields, models
...@@ -58,11 +59,6 @@ class PartnerReleaseModule(models.Model): ...@@ -58,11 +59,6 @@ class PartnerReleaseModule(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
# Onchange / Constraints # Onchange / Constraints
# ------------------------------------------------------ # ------------------------------------------------------
# @api.onchange("release_id")
# def _onchange_release_id(self):
# return {
# "domain": [(modu)]
# }
# ------------------------------------------------------ # ------------------------------------------------------
# CRUD methods (ORM overrides) # CRUD methods (ORM overrides)
......
static/src/css/portal.css
+ 2
− 6
Voir le fichier @ 236a9647
...@@ -37,12 +37,10 @@ Raleway Lato Open Sans ...@@ -37,12 +37,10 @@ Raleway Lato Open Sans
font-size: 0.9rem; font-size: 0.9rem;
} }
.lefilament-release .list-group { .lefilament-release .list-group {
font-size: 0.9rem; font-size: 0.7rem;
} }
.lefilament-release .card-header { .lefilament-release .card-header {
font-size: 0.9rem; font-size: 0.8rem;
border-top-right-radius: 10px;
border-top-left-radius: 10px;
} }
.lefilament-release .table i.fa { .lefilament-release .table i.fa {
font-size: 0.8rem; font-size: 0.8rem;
...@@ -55,8 +53,6 @@ Raleway Lato Open Sans ...@@ -55,8 +53,6 @@ Raleway Lato Open Sans
} }
.lefilament-release .list-group-item:last-child { .lefilament-release .list-group-item:last-child {
margin-bottom: 10px; margin-bottom: 10px;
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
} }
.release-detail { .release-detail {
background-color: #fff; background-color: #fff;
......
templates/partner_release_detail.xml
+ 74
− 89
Voir le fichier @ 236a9647
...@@ -4,9 +4,8 @@ ...@@ -4,9 +4,8 @@
<odoo> <odoo>
<!-- Template Order sans Détail de la commande --> <!-- Template Order sans Détail de la commande -->
<template id="partner_release_detail_template" name="Detail release"> <template id="partner_release_detail_template" name="Detail release">
<t t-call="portal.portal_layout"> <t t-call="web.frontend_layout">
<t t-set="breadcrumbs_searchbar" t-value="False" /> <div class="container" style="max-width: 800px;">
<t t-set="no_breadcrumbs" t-value="True" />
<div class="release-header"> <div class="release-header">
<!-- Titre + retour Accueil --> <!-- Titre + retour Accueil -->
<div class="row"> <div class="row">
...@@ -17,67 +16,54 @@ ...@@ -17,67 +16,54 @@
/> Retour à la liste</a> /> Retour à la liste</a>
</t> </t>
</div> </div>
<div class="col-12 mt16"> <div class="col-12 mt32">
<h1 class="card-title tc1"> <h1>
<t t-esc="release.name" /> <span
t-field="release.partner_id.name"
/> - Release #<span t-field="release.release_number" />
</h1> </h1>
</div> </div>
</div> <!-- Description -->
</div> <div class="col-12 mt32">
<div class="release-detail"> <h2>Détail</h2>
<!-- Header release --> <table class="table table-sm table-hover mt32">
<div class="row"> <tr>
<!-- Client --> <th>Date</th>
<div class="col-3 text-center align-self-center"> <td><span
Client : <br />
<strong><span t-field="release.partner_id.name" /></strong>
</div>
<!-- Day -->
<div class="col-3 text-center align-self-center">
<span
t-field="release.release_date"
t-options="{'widget': 'date', 'format': 'dd'}"
/><br />
<span
t-field="release.release_date"
t-options="{'widget': 'date', 'format': 'MMMM'}"
class="big-number"
/><br />
<span
t-field="release.release_date" t-field="release.release_date"
t-options="{'widget': 'date', 'format': 'YYYY'}" t-options="{'widget': 'date', 'format': 'dd/MM/YYYY'}"
/> /></td>
</div> </tr>
<!-- Hours --> <tr>
<div class="col-3 text-center align-self-center"> <th>Heure</th>
<span <td><span
t-field="release.release_date" t-field="release.release_date"
class="big-number"
t-options="{'widget': 'datetime', 'format': 'HH:mm'}" t-options="{'widget': 'datetime', 'format': 'HH:mm'}"
/> /></td>
</div> </tr>
<!-- Utilisateur --> <tr>
<div class="col-3 align-self-center text-center"> <th>Responsable</th>
Responsable : <br /> <td><span t-field="release.user_id.name" /></td>
<span t-field="release.user_id.name" /> </tr>
</div> </table>
</div> </div>
<hr />
<div class="row"> <!-- Description -->
<div class="col-12"> <div class="col-12 mt32" t-if="release.description">
<t t-if="release.description"> <h2>Description</h2>
<h4 class="tc1 mt32">Description</h4> <p class="mt16">
<p class="mb64">
<span t-field="release.description" /> <span t-field="release.description" />
</p> </p>
</t> </div>
<t t-if="release.release_module_ids">
<h4 class="tc1">Modules mis à jour</h4> <!-- Modules mis à jour -->
<table class="table table-hover"> <div class="col-12 mt32 mb64">
<thead class=""> <h2>Modules mis à jour</h2>
<table class="table table-hover mt32">
<thead>
<tr> <tr>
<th>Type</th>
<th>Module</th> <th>Module</th>
<th>Type</th>
<th>Détail</th> <th>Détail</th>
</tr> </tr>
</thead> </thead>
...@@ -86,20 +72,19 @@ ...@@ -86,20 +72,19 @@
t-foreach="release.release_module_ids.sorted(key=lambda r: r.release_type)" t-foreach="release.release_module_ids.sorted(key=lambda r: r.release_type)"
t-as="module" t-as="module"
> >
<td><span
t-field="module.release_type"
t-att-class="'badge badge-pill badge-warning' if module.release_type == 'fix' else 'badge badge-pill badge-info'"
/></td>
<td> <td>
<strong><span <strong><span
t-field="module.module_id.name" t-field="module.module_id.name"
/></strong> /></strong>
</td> </td>
<td><span
t-field="module.release_type"
/></td>
<td><span t-field="module.log" /></td> <td><span t-field="module.log" /></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</t> </div>
</div> </div>
</div> </div>
</div> </div>
......
templates/partner_release_list.xml
+ 19
− 24
Voir le fichier @ 236a9647
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<template id="partner_release_list_portal_template" name="Mes Releases"> <template id="partner_release_list_portal_template" name="Mes Releases">
<t t-call="portal.portal_layout"> <t t-call="portal.frontend_layout">
<t t-set="breadcrumbs_searchbar" t-value="False" /> <div class="container lefilament-release" style="max-width: 800px;">
<t t-set="no_breadcrumbs" t-value="True" />
<div class="lefilament-release">
<div class="row"> <div class="row">
<div class="col-12 mt16"> <div class="col-12 mt16">
<h1 class="card-title tc1 mt16 mb32"> <h1 class="mt16 mb32">
<t t-esc="company" /> - Liste de mises à jour <t t-esc="company" /> - Liste des releases
</h1> </h1>
<t t-call="lefilament_release.release_list_template" /> <t t-call="lefilament_release.release_list_template" />
</div> </div>
...@@ -19,42 +17,39 @@ ...@@ -19,42 +17,39 @@
<template id="release_list_template"> <template id="release_list_template">
<t t-if="release_ids"> <t t-if="release_ids">
<ul class="list-group"> <ul class="list-group list-group-flush">
<div class="list-group-item card-header bc3 d-flex"> <div
<div class="col-1 font-weight-bold">Date</div> class="list-group-item card-header list-group-item-secondary d-flex"
<div class="col-1 font-weight-bold">Heure</div> >
<div class="col-2 font-weight-bold">Utilisateur</div> <div class="col-1 font-weight-bold">N°</div>
<div class="col-4 font-weight-bold">Commentaire</div> <div class="col-2 font-weight-bold">Date</div>
<div class="col-4 font-weight-bold">Modules</div> <div class="col-2 font-weight-bold">Heure</div>
<div class="col-3 font-weight-bold">Utilisateur</div>
<div class="col-4 font-weight-bold">Description</div>
</div> </div>
<t t-foreach="release_ids" t-as="release"> <t t-foreach="release_ids" t-as="release">
<a <a
t-att-href="release.release_share_link" t-att-href="release.release_share_link"
class="list-group-item list-group-item-action d-flex" class="list-group-item list-group-item-action d-flex"
> >
<div class="col-1"><span <div class="col-1">#<span
t-field="release.release_number"
/></div>
<div class="col-2"><span
t-field="release.release_date" t-field="release.release_date"
t-options="{'widget': 'date', 'format': 'dd/MM/YYYY'}" t-options="{'widget': 'date', 'format': 'dd/MM/YYYY'}"
/></div> /></div>
<div class="col-1"><span <div class="col-2"><span
t-field="release.release_date" t-field="release.release_date"
t-options="{'widget': 'datetime', 'format': 'HH:mm'}" t-options="{'widget': 'datetime', 'format': 'HH:mm'}"
/></div> /></div>
<div class="col-2"><span <div class="col-3"><span
t-field="release.user_id.name" t-field="release.user_id.name"
/></div> /></div>
<div <div
class="col-4" class="col-4"
style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden;" style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden;"
><t t-esc="release.description" /></div> ><t t-esc="release.description" /></div>
<div class="col-4">
<t t-foreach="release.release_module_ids" t-as="module">
<span
class="'badge badge-pill badge-light"
t-field="module.module_id.name"
/>
</t>
</div>
</a> </a>
</t> </t>
</ul> </ul>
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter