From 6e4cae64f4939ccac68aa3db1387290a7d942a86 Mon Sep 17 00:00:00 2001
From: eloyoussef <elo.yusuf@gmail.com>
Date: Mon, 12 Feb 2018 16:05:52 +0100
Subject: [PATCH] =?UTF-8?q?prendre=20en=20compte=20les=20remarques=20relat?=
 =?UTF-8?q?ives=20aux=20r=C3=A9servation=20sur=20une=20p=C3=A9riode=20d'in?=
 =?UTF-8?q?disponibilit=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 golem_ressources/models/golem_resources.py    | 25 +++++++++++-
 .../views/golem_resources_views.xml           | 40 +++++++++----------
 2 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/golem_ressources/models/golem_resources.py b/golem_ressources/models/golem_resources.py
index a57d17d..7fc6b20 100644
--- a/golem_ressources/models/golem_resources.py
+++ b/golem_ressources/models/golem_resources.py
@@ -54,8 +54,8 @@ class GolemReservation(models.Model):
     start_date = fields.Datetime()
     end_date = fields.Datetime()
     linked_resource = fields.Many2one('golem.resources', required=True)
-    user = fields.Many2one('res.users', required=True)
-    on_behalf_of = fields.Many2one('res.partner', required=True)
+    user = fields.Many2one('res.users', required=True,  default=lambda self: self.env.user)
+    on_behalf_of = fields.Many2one('res.partner', required=True, default=lambda self: self.env['res.partner'])
     #statut=fields.Char()
     status = fields.Selection([
         ('draft', "Draft"),
@@ -79,9 +79,29 @@ class GolemReservation(models.Model):
     @api.constrains('status')
     def _onConfirmReservation(self):
         if self.status == 'confirmed':
+            #verifyin is the reservation is taking place out of the resource availibility period
             if(self.start_date < self.linked_resource.start_of_availability_date or self.end_date > self.linked_resource.end_of_availability_date ):
                 raise exceptions.UserError('Not allowed, the resource is not available in this period, please choose another périod before confirming %s' % self.linked_resource.start_of_availability_date)
             else :
+                #verifying if the reservation is taking place out the availibility timetable
+                #defining a boolean flag, which will determine if the day of the reservation is available
+                r_allowed = False
+                for day in self.linked_resource.timetable :
+                    #if the day is available, look for the time if it's inside the resource timetable availibility
+                    if day.name.id_day == fields.Datetime.from_string(self.start_date).weekday():
+                        start_hour = fields.Datetime.from_string(self.start_date).hour
+                        start_min = float(fields.Datetime.from_string(self.start_date).minute) #+(int(fields.Datetime.from_string(self.start_date).min))/100
+                        start_time_r = start_hour + start_min/100
+                        start_hour = fields.Datetime.from_string(self.end_date).hour
+                        start_min = float(fields.Datetime.from_string(self.end_date).minute) #+(int(fields.Datetime.from_string(self.start_date).min))/100
+                        end_time_r = start_hour + start_min/100
+                        #if the time is suitable, the flag state is changed
+                        if(start_time_r > day.start_time and end_time_r < day.end_time):
+                            r_allowed = True
+                #if the flag is changed no erreur is raised.
+                if(not r_allowed):
+                            raise exceptions.UserError("Not allowed, the resource is not available during this timetable, please choose another time before confirming ")
+                #verifying if the resource is already taken during this period
                 for reservation in self.linked_resource.reservation :
                     if(self.id != reservation.id and reservation.status == 'confirmed' and not (self.end_date < reservation.start_date or self.start_date > reservation.end_date)):
                         raise exceptions.UserError("Not allowed, the resource is taken during this period, please choose another période before confirming ")
@@ -103,6 +123,7 @@ class GolemWeekDay(models.Model):
     _description = 'GOLEM Week Day'
 
     name = fields.Char(string='Week Day')
+    id_day = fields.Integer()
 
 #modèle de gestion horaire
 class GolemTimetable(models.Model):
diff --git a/golem_ressources/views/golem_resources_views.xml b/golem_ressources/views/golem_resources_views.xml
index 790009c..48057d1 100644
--- a/golem_ressources/views/golem_resources_views.xml
+++ b/golem_ressources/views/golem_resources_views.xml
@@ -18,26 +18,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <odoo>
   <data>
     <!-- Remplissage du modele golem.weekday par les jours de la semaine -->
-    <record model="golem.weekday" id="1">
+    <record model="golem.weekday" id="6">
+
             <field name="name">Sunday</field>
+            <field name="id_day">6</field>
+    </record>
+    <record model="golem.weekday" id="0">
+            <field name="name">Monday</field>
+            <field name="id_day">0</field>
+    </record>
+    <record model="golem.weekday" id="1">
+            <field name="name">Tuesday</field>
+            <field name="id_day">1</field>
     </record>
     <record model="golem.weekday" id="2">
-            <field name="name">Monday</field>
+            <field name="name">wednesday</field>
+            <field name="id_day">2</field>
     </record>
     <record model="golem.weekday" id="3">
-            <field name="name">Tuesday</field>
+            <field name="name">Thursday</field>
+            <field name="id_day">3</field>
     </record>
     <record model="golem.weekday" id="4">
-            <field name="name">wednesday</field>
+            <field name="name">Friday</field>
+            <field name="id_day">4</field>
     </record>
     <record model="golem.weekday" id="5">
-            <field name="name">Thursday</field>
-    </record>
-    <record model="golem.weekday" id="6">
-            <field name="name">Friday</field>
-    </record>
-    <record model="golem.weekday" id="7">
             <field name="name">Saturday</field>
+            <field name="id_day">5</field>
     </record>
 
     <!--formulaire de recherche et filtrage du modèle golem.resources-->
@@ -108,18 +116,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     </tree>
                   </field>
               </group>
-              <group colspan="3">
-                  <field name="reservation" >
-                    <tree >
-                      <field name="linked_resource" invisible="1"/>
-                       <field name="start_date"/>
-                       <field name="end_date" />
-                       <field name="user" />
-                       <field name="on_behalf_of" />
-                       <field name="status" widget="statusbar" />
-                    </tree>
-                  </field>
-              </group>
             </group>
           </sheet>
         </form>