Skip to content
Extraits de code Groupes Projets
Valider 98030767 rédigé par Juliana's avatar Juliana
Parcourir les fichiers

Modifs lien sur les boutons

parent 6bfc66ec
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -45,6 +45,7 @@ class ScopHome(models.AbstractModel): ...@@ -45,6 +45,7 @@ class ScopHome(models.AbstractModel):
'summary': a.summary, 'summary': a.summary,
'partner': self.env['res.partner'].browse(a.res_id).name, 'partner': self.env['res.partner'].browse(a.res_id).name,
}, activity_today_list)) }, activity_today_list))
activity_week = activity_ids.filtered( activity_week = activity_ids.filtered(
lambda a: a.date_deadline > Date.today() and a.date_deadline <= (Date.today() + timedelta(days=7))) lambda a: a.date_deadline > Date.today() and a.date_deadline <= (Date.today() + timedelta(days=7)))
activity_overdue = activity_ids.filtered( activity_overdue = activity_ids.filtered(
...@@ -64,11 +65,53 @@ class ScopHome(models.AbstractModel): ...@@ -64,11 +65,53 @@ class ScopHome(models.AbstractModel):
['date', '<=', month_end]]) ['date', '<=', month_end]])
last_monthtime = sum(timesheet_month.mapped('unit_amount')) last_monthtime = sum(timesheet_month.mapped('unit_amount'))
# Récupération des Menus,
# Id des Menus et Actions correspondantes
list_links = []
# Menu mes organismes
menu_contact = self.env['ir.model.data'].sudo().search([
('name', '=', 'menu_contacts')])
menu_ref = self.env['ir.model.data'].sudo().search([
('name', '=', 'menu_action_cooperative')])
menu_id = self.env['ir.ui.menu'].sudo().search([
('id', '=', menu_ref.res_id)])
link_href = "#menu_id=" + str(menu_contact.res_id) + "&action=" + str(menu_id.action.id)
list_links.append({
'name': "Organismes suivis",
'href': link_href})
# Menu mes projets
menu_ref = self.env['ir.model.data'].sudo().search([
('name', '=', 'menu_action_prospect')])
menu_id = self.env['ir.ui.menu'].sudo().search([
('id', '=', menu_ref.res_id)])
link_href = "#menu_id=" + str(menu_contact.res_id) + "&action=" + str(menu_id.action.id)
list_links.append({'name': "Mes projets", 'href': link_href})
# Action mes révisions
menu_ref = self.env['ir.model.data'].sudo().search([
('name', '=', 'home_scop_cooperative_rev_act')])
link_href = "#menu_id=" + str(menu_contact.res_id) + "&action=" + str(menu_ref.res_id)
list_links.append({'name': "Les révisions", 'href': link_href})
# Action mon suivi du temps
menu_ref = self.env['ir.model.data'].sudo().search([
('name', '=', 'act_hr_timesheet_line')])
mon_suivi = "#menu_id=" + str(menu_contact.res_id) + "&action=" + str(menu_ref.res_id)
return { return {
'events': events, 'events': events,
'weektime': weektime, 'weektime': weektime,
'last_monthtime': last_monthtime, 'last_monthtime': last_monthtime,
'activity_today': activity_today, 'activity_today': activity_today,
'activity_week': len(activity_week), 'activity_week': len(activity_week),
'activity_overdue': len(activity_overdue) 'activity_overdue': len(activity_overdue),
'list_links': list_links,
'mon_suivi': mon_suivi,
} }
...@@ -21,22 +21,6 @@ odoo.define('cgscop_home.home', function (require) { ...@@ -21,22 +21,6 @@ odoo.define('cgscop_home.home', function (require) {
e.preventDefault(); e.preventDefault();
this.do_action('cgscop_home.home_scop_activity_act'); this.do_action('cgscop_home.home_scop_activity_act');
}, },
'click #timesheet': function(e) {
e.preventDefault();
this.do_action('hr_timesheet.act_hr_timesheet_line');
},
'click #follow': function(e) {
e.preventDefault();
this.do_action('cgscop_home.home_scop_cooperative_act');
},
'click #project': function(e) {
e.preventDefault();
this.do_action('cgscop_home.home_scop_prospect_act');
},
'click #revision': function(e) {
e.preventDefault();
this.do_action('cgscop_home.home_scop_cooperative_rev_act');
},
}, },
willStart: function() { willStart: function() {
......
...@@ -47,15 +47,11 @@ ...@@ -47,15 +47,11 @@
<div class="card-body"> <div class="card-body">
<h5 class="card-title"><i class="fa fa-link"></i> Mes liens</h5> <h5 class="card-title"><i class="fa fa-link"></i> Mes liens</h5>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
<t t-foreach="widget.values.list_links" t-as="link">
<li class="list-group-item"> <li class="list-group-item">
<a href="#" id="follow">Organismes suivis</a> <a t-att-href="link['href']"><t t-esc="link['name']"/></a>
</li>
<li class="list-group-item">
<a href="#" id="project">Mes projets</a>
</li>
<li class="list-group-item">
<a href="#" id="revision">Les révisions</a>
</li> </li>
</t>
<li class="list-group-item"> <li class="list-group-item">
<a href="https://documents.scop.coop" target="_blank">Alfresco</a> <a href="https://documents.scop.coop" target="_blank">Alfresco</a>
</li> </li>
...@@ -77,7 +73,7 @@ ...@@ -77,7 +73,7 @@
</div> </div>
</div> </div>
<p style="margin-top: 15px;"> <p style="margin-top: 15px;">
<button id="timesheet" class="btn btn-primary">Voir mon suivi du temps</button> <a t-att-href="widget.values.mon_suivi" class="btn btn-primary">Voir mon suivi du temps</a>
</p> </p>
</div> </div>
</div> </div>
......
...@@ -4,43 +4,6 @@ ...@@ -4,43 +4,6 @@
<odoo> <odoo>
<data> <data>
<!-- Prospects Action -->
<record model="ir.actions.act_window" id="home_scop_prospect_act">
<field name="name">Prospects</field>
<field name="res_model">res.partner</field>
<field name="view_type">form</field>
<field name="view_mode">kanban,tree,form,activity</field>
<field name="search_view_id" ref="cgscop_partner.scop_partner_view_search"/>
<field name="domain" eval="[('is_cooperative', '=', True),('project_status','in',('1_information','2_pre-diagnostic','3_accompagnement','4_adhesion','5_cg'))]"/>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'kanban', 'view_id': ref('cgscop_partner.view_partner_cooperative_kanban')}),
(0, 0, {'view_mode': 'tree', 'view_id': ref('cgscop_partner.view_partner_prospect_tree')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('cgscop_partner.view_partner_cooperative_form')})]"/>
<field name="context">{'search_default_my_projects': True, 'default_is_company': True, 'default_is_cooperative': True, 'default_company_type': 'company', 'default_project_status': '1_information'}</field>
</record>
<!-- Cooperatives Action -->
<record model="ir.actions.act_window" id="home_scop_cooperative_act">
<field name="name">Coopératives</field>
<field name="res_model">res.partner</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,activity</field>
<field name="search_view_id" ref="cgscop_partner.scop_partner_view_search"/>
<field name="domain" eval="[('is_cooperative', '=', True),('project_status','=','6_suivi')]"/>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('cgscop_partner.view_partner_cooperative_tree')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('cgscop_partner.view_partner_cooperative_form')})]"/>
<field name="context">
{
'search_default_my_scop_followed': True,
'default_is_company': True,
'default_is_cooperative': True,
'default_company_type': 'company',
'default_project_status': '6_suivi'
}
</field>
</record>
<!-- Cooperatives Action --> <!-- Cooperatives Action -->
<record model="ir.actions.act_window" id="home_scop_cooperative_rev_act"> <record model="ir.actions.act_window" id="home_scop_cooperative_rev_act">
<field name="name">Coopératives</field> <field name="name">Coopératives</field>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter