Merge branch 'master' of https://github.com/ERIN-LIST/iguess into dev…

…elop
LIST-LUXEMBOURG · Aug 13, 2015 · 775194e · 775194e
2 parents ed1f0fa + 7f8a8b3
commit 775194e
Show file tree

Hide file tree

Showing 5 changed files with 134 additions and 48 deletions.
diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
@@ -6,8 +6,10 @@ def new_user_waiting_for_approval(user)
     # Thus the default URL is sent.
     @url  = BASE_URL + '/users/edit/' + user.id.to_s
     admins = User.find_all_by_is_admin true
+    role3 = User.where(role_id: [3])
     addr_list = Array.new
     admins.each do |admin| addr_list.push(admin.email) end
+    role3.each do |user| addr_list.push(user.email) end
     mail(to: addr_list, subject: "New User Awaiting Approval: #{@user.first_name} #{@user.last_name}")
   end
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -82,8 +82,9 @@ def self.canAccessObject(current_user, object)
 
 
   def self.getCurrentCity(current_user, cookies)
-    return (current_user and current_user.role_id == 1) ? (City.find_by_id(current_user.city_id)) : 
-                                                          (City.find_by_id(cookies['city']) or City.first)
+    return (current_user and ((current_user.role_id == 1) or (current_user.role_id == 3))) ? 
+      (City.find_by_id(current_user.city_id)) : 
+      (City.find_by_id(cookies['city']) or City.first)
   end
 
 end

diff --git a/app/views/home/_lamilo_about.html.erb b/app/views/home/_lamilo_about.html.erb
@@ -1,59 +1,120 @@
 <div class="home-page-text">
 
+  <h2>Features overview</h2>
+
+  <p>
+  	Smart City Logistics enables you to design and build a greener city logistics. It offers a wide range of features that simplify communication and decision making about urban logistics.
+  </p>
+
+  <ul class="about">
+	<li class="about">User account</li>
+   <p>Registered users have access to all the maps of a city for which he subscribes and have extended access to modules, data manager and scenario.</p>
+	<li class="about">Maps</li>
+<p>The feature provides you an easy way to look at the urban logistics and understand situation for a specific city. Data come from OSM, commercial websites and websites of cities.</p>
+	<li class="about">Data manager (for registered user only)</li>
+<p>It enables you to register and display new maps via web services.</p>
+	<li class="about">Modules</li>
+<p>Modules allow you to plan a route by van, by truck, by bicycle or on foot in order to get the shortest, the quickest or the most sustainable route direction to the destination of your choice.</p> 
+	<li class="about">Scenario</li>
+<p>To compute current nuisances associated to the urban delivery activity and create scenarii highlighting the variations in CO2 emission.</p>
+	</ul>
+
+
+  <h2>Team</h2>
+
   <p>
-    Smart City Logistics is based on the open source geospatial software framework iGUESS built on the Open Geospatial Consortium (OGC) Standards. It allows easy and transparent ways of data integration and exchange, the integration and linking of modelling tools and the visualisation of information. iGUESS provides a basis for web based decision support platforms in the fields of Urban logistics, Energy planning, Water management, Air Pollution and Ecosystems Services to make our Cities smarter.
+  	The team is composed of multidisciplinary engineers. 
+	For more information about the Smart City Logistics platform and iGUESS, please contact the product manager 
+	<script type="text/javascript" language="javascript">
+	<!--
+	// Email obfuscator script 2.1 by Tim Williams, University of Arizona
+	// Random encryption key feature by Andrew Moulden, Site Engineering Ltd
+	// This code is freeware provided these four comment lines remain intact
+	// A wizard to generate this code is at http://www.jottings.com/obfuscator/
+	{ coded = "VLGHox.LUZfZLj@LHkO.LV"
+	  key = "AkUP4iGoq8MESBOdgf3DWFJKYIaHhZzln2ubwjRyTsem5CrcQ1xN0Lt6VpX9v7"
+	  shift=coded.length
+	  link=""
+	  for (i=0; i<coded.length; i++) {
+	    if (key.indexOf(coded.charAt(i))==-1) {
+	      ltr = coded.charAt(i)
+	      link += (ltr)
+	    }
+	    else {     
+	      ltr = (key.indexOf(coded.charAt(i))-shift+key.length) % key.length
+	      link += (key.charAt(ltr))
+	    }
+	  }
+	document.write("<a href='mailto:"+link+"'>Ulrich Leopold</a>")
+	}
+	//-->
+	</script><noscript>Sorry, you need Javascript on to email me.</noscript>. 
+	For more information about the LaMiLo project, please contact the project manager 
+	<script type="text/javascript" language="javascript">
+	<!--
+	// Email obfuscator script 2.1 by Tim Williams, University of Arizona
+	// Random encryption key feature by Andrew Moulden, Site Engineering Ltd
+	// This code is freeware provided these four comment lines remain intact
+	// A wizard to generate this code is at http://www.jottings.com/obfuscator/
+	{ coded = "1btnh.dP7NYbt@Ybwr.YP"
+	  key = "xWImFe1s05knNPTLBSRZ6yopQX7DwJlgtV3EjOi8Gvh24Hzc9fAYdruCMqabUK"
+	  shift=coded.length
+	  link=""
+	  for (i=0; i<coded.length; i++) {
+	    if (key.indexOf(coded.charAt(i))==-1) {
+	      ltr = coded.charAt(i)
+	      link += (ltr)
+	    }
+	    else {     
+	      ltr = (key.indexOf(coded.charAt(i))-shift+key.length) % key.length
+	      link += (key.charAt(ltr))
+	    }
+	  }
+	document.write("<a href='mailto:"+link+"'>Cindy Guerlin</a>")
+	}
+	//-->
+	</script><noscript>Sorry, you need Javascript on to email me.</noscript>.
   </p>
 
+
+  <h2>Technology</h2>
   <p>
-    For further information on OGC standards please see <a href="http://youtu.be/bfkCdir-yO8">http://youtu.be/bfkCdir-yO8</a>.
+     Smart City Logistics has been developed and is hosted by the Luxembourg Institute of Science and Technology. It was part of the LaMiLo project, an initiative funded by the programme Interreg IVB NWE
+  </p><p> 
+    Smart City Logistics is based on the open source geospatial software framework <a href=https://github.com/ERIN-LIST/iguess>iGUESS</a> built on the Open Geospatial Consortium (OGC) Standards. It allows easy and transparent ways of data integration and exchange, the integration and linking of modelling tools and the visualisation of information. iGUESS provides a basis for web based decision support platforms in the fields of Urban Logistics, Energy planning, Water management, Air Pollution and Ecosystems Services to make our Cities smarter. 
   </p>
 
-  <h2>The iGUESS Team</h2>
 
-  <ul>
-     <li>  Christian Braun</li>
-     <li>  Luís de Sousa</li>
-     <li>  Matteo de Stefano</li>
-     <li>  Ulrich Leopold</li>
-     <li>  Rui Martins</li>
-     <li>  Alessio Mastrucci</li>
+  <h2>The iGUESS Software Framework Team</h2>
+  <ul class="about">
+	<li>Christian Braun (Geocomputation and modelling expert, OGC web services)</li>
+	<li>Luís de Sousa (Geospatial Software Architecture and Development, modelling expert, OGC web services, PyWPS)</li>
+	<li>Matteo de Stefano (Geospatial Software Development, Meta Data Services)</li>
+	<li>Ulrich Leopold (iGUESS Manager, Geocomputaton expert, Geostatistics)</li>
+	<li>Alessio Mastrucci (Energy modelling expert, statistical modelling)</li>
+	<li>Mickaël Stefas (Geospatial Software Development)</li>
+	<li>Patrik Hitzelberger (Database expert)</li>
+	<li>Maël Cornil (Geospatial Software Development)</li>
+  </ul>
+
+  <br>
+  <i>Former team members</i> 
+  <ul class="about">
+	<li>Olivier Baume (Gecomputation expert, statistical modelling)</li>
+	<li>Christopher Eykamp (Geospatial Software Developer)</li>
+	<li>Rui Martins (Energy expert)</li>
   </ul>
+
   <br>
-  <i>Former team members and additional contributors</i>
-  <ul>
-     <li>  Olivier Baume</li>
-     <li>  Calin Ciociu</li>
-     <li>  Luisa Egenlauf</li>
-     <li>  Christopher Eykamp</li>
-     <li>  Jovial Matshazi</li>
-     <li>  Susanna Salvucci</li>
-     <li>  Kerry Schiel</li>
+  <i>Students</i>
+  <ul class="about">
+	<li>Calin Ciociu (Computer Science, University of Luxembourg, Luxembourg)</li>
+	<li>Luisa Egenlauf (Geography, University of Heidelberg, Germany)</li>
+	<li>Jovial Matshazi (UNESCO-IHE, University of Delft, Netherlands)</li>
+	<li>Susanna Salvucci (Architecture, University Marche, Italy)</li>
+	<li>Kerry Schiel (Geography, University of Luxembourg)</li>
+	<li>Florent Zajda (Paris Graduate School of Digital Innovation (Epitech), University of Nancy, France)</li>
   </ul>
-
-  <h2>Contact</h2>
-  For more information about the iGUESS project, please contact 
-<script type="text/javascript" language="javascript">
-<!--
-// Email obfuscator script 2.1 by Tim Williams, University of Arizona
-// Random encryption key feature by Andrew Moulden, Site Engineering Ltd
-// This code is freeware provided these four comment lines remain intact
-// A wizard to generate this code is at http://www.jottings.com/obfuscator/
-{ coded = "VLGHox.LUZfZLj@LHkO.LV"
-  key = "AkUP4iGoq8MESBOdgf3DWFJKYIaHhZzln2ubwjRyTsem5CrcQ1xN0Lt6VpX9v7"
-  shift=coded.length
-  link=""
-  for (i=0; i<coded.length; i++) {
-    if (key.indexOf(coded.charAt(i))==-1) {
-      ltr = coded.charAt(i)
-      link += (ltr)
-    }
-    else {     
-      ltr = (key.indexOf(coded.charAt(i))-shift+key.length) % key.length
-      link += (key.charAt(ltr))
-    }
-  }
-document.write("<a href='mailto:"+link+"'>Ulrich Leopold</a>")
-}
-//-->
-</script><noscript>Sorry, you need Javascript on to email me.</noscript>
+
+
 </div>
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -317,3 +317,16 @@
 end
 
 
+# ---------- Users ---------- #
+
+# New role: 3
+# GitHub: https://github.com/ERIN-LIST/iguess/issues/278
+# Mantis: http://iguess-support.kirchberg.tudor.lu/view.php?id=228
+guerlain = User.where('email LIKE ?', '%guerlain%').all
+guerlain.each do |g|
+  g.role_id = 3
+  g.save
+end
+
+
+
diff --git a/public/site_styles/lamilo.css b/public/site_styles/lamilo.css
@@ -88,6 +88,15 @@ ul.footer-menu li a:before, ul.footer-menu li .item:before, ul.footer-menu li .s
   vertical-align: middle;
 }
 
+ul.about
+{
+	list-style: disc;
+}
+
+li.about
+{
+	margin-left: 20px;
+}
 
 .home-page-text {
   text-align: left;