Merge branch 'master' of https://github.com/amadeusproject/amadeuslms

Ailson da Cruz
2 parents 9e9d949c 59782ae9
Showing 4 changed files with 160 additions and 29 deletions Show diff stats
app/templates/home_professor.html
courses/templates/course/view.html
courses/views.py
users/templates/users/profile.html
@@ -6,7 +6,7 @@
 	<div class="row">
       	<div class="col-md-12">
             <ul class="breadcrumb">
-          		<li><a href="{% url 'core:home' %}">{% trans 'Home' %}</a></li>
+          		<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
             </ul>
       	</div>
     </div>
-{% extends 'app/base.html' %}
+{% extends 'home_professor.html' %}
  
 {% load static i18n permission_tags %}
  
 {% block breadcrumbs %}
-	<ol class="breadcrumb">
-	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-	  	<li class="active">{{ course }}</li>
-	</ol>
+	<div class="row">
+      	<div class="col-md-12">
+            <ul class="breadcrumb">
+          		<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+      			<li class="active">{{ course }}</li>
+            </ul>
+      	</div>
+    </div>
 {% endblock %}
  
+
 {% block sidebar %}
-	<div class="list-group">
+
+{{block.super}}
+<div class="row">
+	<div class="col-md-12">
+        <div class="panel panel-primary navigation">
+          <div class="panel-heading">
+            <h5>{% trans 'Subjects' %}</h5>
+          </div>
+          <div class="panel-body">
+            <ul class="nav nav-pills nav-stacked">
+	            {% for subject in subjects %}
+	            	<li><a href="">{{subject.name}}</a></li>
+	            {% endfor %}
+            </ul>
+          </div>
+        </div>
+      </div>
+</div>
+<!--<div class="list-group">
 	  	<a href="{% url 'course:manage' %}" class="list-group-item">
 	    	{% trans 'Courses' %}
 	  	</a>
@@ -40,11 +63,12 @@
 		    	{% trans 'Delete Course' %}
 		  	</a>
 		{% endif %}
-	</div>
+	</div> -->
 {% endblock %}
  
 {% block content %}
-	<div class="row">
+
+<div class="row">
 		<div class="col-sm-3">
 			<img src="{{ course.image.url }}" class="img-responsive" />
 		</div>
@@ -70,4 +94,23 @@
 			</p>
 		</div>
 	</div>
+	<div class="row">
+      <div class="col-md-12">
+        	<h3>Subjects</h3>
+        	{% for subject in subjects %}
+  		        <div class="panel panel-info">
+		            <div class="panel-heading">
+		              	<h3 class="panel-title">Subject 1</h3>
+		              </div>
+		              <div class="panel-body">
+		                Dummy Info
+		             </div>
+              	</div>
+        	{% endfor %}
+        </div>
+      </div>
+
 {% endblock %}
+
+{% block rightbar %}
+{% endblock rightbar %}
@@ -81,6 +81,14 @@ class View(LoginRequiredMixin, generic.DetailView):
 	context_object_name = 'course'
 	template_name = 'course/view.html'
  
+	def get_context_data(self, **kwargs):
+		context = super(View, self).get_context_data(**kwargs)
+		course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
+		subjects = Subject.objects.filter(Q(visible=True) | Q(professors__in=[self.request.user]) | Q(course = course))
+		context['subjects'] = subjects
+
+		return context
+
 class DeleteView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
  
 	allowed_roles = ['professor', 'system_admin']
@@ -23,27 +23,107 @@
  
 {% block content %}
 	<div class="row">
-		<div class="col-sm-3">
-			<img src="{{ user.image.url }}" class="img-responsive" />
+		<div class="row">
+		<div class="col-lg-offset-4 col-lg-2">
+			<img src="" class="img-responsive center-block " alt="logo amadeus">
 		</div>
-		<div class="col-sm-9">
-			<h4>{{ user }}</h4>
-			<span class="label label-info">{% if user.type_profile %}{{ user.get_type_profile_display }}{% else %}
-			{% trans 'Administrator' %} {% endif %}</span>
-			<span class="label label-primary">{{ user.get_gender_display }}</span>
-			<span class="label label-warning">{{ user.city }} / {{ user.state }}</span>
-			<p>
-				<strong>{% trans 'Mail:' %} </strong> {{ user.email }}
-			</p>
-			<p>
-				<strong>{% trans 'Phone:' %} </strong> {{ user.phone }}
-			</p>
-			<p>
-				<strong>{% trans 'Cpf' %}: </strong> {{ user.cpf }}
-			</p>
-			<p>
-				<strong>{% trans 'Birth date' %}: </strong> {{ user.birth_date }}
-			</p>
+	</div>
+	<div class="row">
+		<div class="col-lg-12">
+			<div class="card">
+				<div class="card-content">
+					<div class="card-body">
+						<div class="row">
+							<div class="col-md-4">
+								<img src="{{ user.image.url }}" class="img-responsive center-block img-circle" alt="foto perfil" style="max-height:174px">
+							</div>
+							<div class="col-md-8">
+								<table class="table table-hover table-edited">
+									<tbody>
+										<tr>
+											<td>Status:</td>
+											<td>Offline</td>
+										</tr>
+										<tr>
+											<td>Nome:</td>
+											<td>{{user}}</td>
+										</tr>
+										<tr>
+											<td>Login:</td>
+											<td>{{user.username}}</td>
+										</tr>
+										<tr>
+											<td>Email:</td>
+											<td>{{user.email}}</td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-10 col-md-offset-1">
+								<table class="table table-hover table-edited">
+									<tbody>
+										<tr>
+											<td>Tipo de usuário:</td>
+											<td>{{use.type_profile}}</td>
+										</tr>
+										<tr>
+											<td>CPF:</td>
+											<td>{{user.cpf}}</td>
+										</tr>
+										<tr>
+											<td>Número de telefone:</td>
+											<td>{{user.phone}}</td>
+										</tr>
+										<tr>
+											<td>Sexo:</td>
+											<td>{{user.gender}}</td>
+										</tr>
+										<tr>
+											<td>Data de Nascimento:</td>
+											<td>{{user.birth_date}}</td>
+										</tr>
+										<tr>
+											<td>Estado e Cidade:</td>
+											<td>{{user.state}} - {{user.city}}</td>
+										</tr>
+										<tr>
+											<td>Titulação:</td>
+											<td>Mestrado</td>
+										</tr>
+										<tr>
+											<td>Ano:</td>
+											<td>2012</td>
+										</tr>
+										<tr>
+											<td>Instituição:</td>
+											<td>UFPE</td>
+										</tr>
+										<tr>
+											<td>Currículo:</td>
+											<td>-</td>
+										</tr>	
+									</tbody>
+								</table>
+							</div>
+						</div>
+					</div>
+				</div>
+				<footer class="card-footer">
+					<div class="col-md-6">
+						<button class="btn btn-flat">Edit Profile</button>
+					</div>
+					<div class="col-md-6">
+						<button class="btn btn-flat btn-danger pull-right">Delete Account</button>
+					</div>
+				</footer>
+
+			</div>
+
+
 		</div>
 	</div>
+</div>
+	</div>
 {% endblock %}
...	...	@@ -6,7 +6,7 @@
6	6	<div class="row">
7	7	<div class="col-md-12">
8	8	<ul class="breadcrumb">
9		- <li><a href="{% url 'core:home' %}">{% trans 'Home' %}</a></li>
	9	+ <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
10	10	</ul>
11	11	</div>
12	12	</div>
...	...
1		-{% extends 'app/base.html' %}
	1	+{% extends 'home_professor.html' %}
2	2
3	3	{% load static i18n permission_tags %}
4	4
5	5	{% block breadcrumbs %}
6		- <ol class="breadcrumb">
7		- <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
8		- <li class="active">{{ course }}</li>
9		- </ol>
	6	+ <div class="row">
	7	+ <div class="col-md-12">
	8	+ <ul class="breadcrumb">
	9	+ <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
	10	+ <li class="active">{{ course }}</li>
	11	+ </ul>
	12	+ </div>
	13	+ </div>
10	14	{% endblock %}
11	15
	16	+
12	17	{% block sidebar %}
13		- <div class="list-group">
	18	+
	19	+{{block.super}}
	20	+<div class="row">
	21	+ <div class="col-md-12">
	22	+ <div class="panel panel-primary navigation">
	23	+ <div class="panel-heading">
	24	+ <h5>{% trans 'Subjects' %}</h5>
	25	+ </div>
	26	+ <div class="panel-body">
	27	+ <ul class="nav nav-pills nav-stacked">
	28	+ {% for subject in subjects %}
	29	+ <li><a href="">{{subject.name}}</a></li>
	30	+ {% endfor %}
	31	+ </ul>
	32	+ </div>
	33	+ </div>
	34	+ </div>
	35	+</div>
	36	+<!--<div class="list-group">
14	37	<a href="{% url 'course:manage' %}" class="list-group-item">
15	38	{% trans 'Courses' %}
16	39	</a>
...	...	@@ -40,11 +63,12 @@
40	63	{% trans 'Delete Course' %}
41	64	</a>
42	65	{% endif %}
43		- </div>
	66	+ </div> -->
44	67	{% endblock %}
45	68
46	69	{% block content %}
47		- <div class="row">
	70	+
	71	+<div class="row">
48	72	<div class="col-sm-3">
49	73	<img src="{{ course.image.url }}" class="img-responsive" />
50	74	</div>
...	...	@@ -70,4 +94,23 @@
70	94	</p>
71	95	</div>
72	96	</div>
	97	+ <div class="row">
	98	+ <div class="col-md-12">
	99	+ <h3>Subjects</h3>
	100	+ {% for subject in subjects %}
	101	+ <div class="panel panel-info">
	102	+ <div class="panel-heading">
	103	+ <h3 class="panel-title">Subject 1</h3>
	104	+ </div>
	105	+ <div class="panel-body">
	106	+ Dummy Info
	107	+ </div>
	108	+ </div>
	109	+ {% endfor %}
	110	+ </div>
	111	+ </div>
	112	+
73	113	{% endblock %}
	114	+
	115	+{% block rightbar %}
	116	+{% endblock rightbar %}
...	...
...	...	@@ -81,6 +81,14 @@ class View(LoginRequiredMixin, generic.DetailView):
81	81	context_object_name = 'course'
82	82	template_name = 'course/view.html'
83	83
	84	+ def get_context_data(self, **kwargs):
	85	+ context = super(View, self).get_context_data(**kwargs)
	86	+ course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
	87	+ subjects = Subject.objects.filter(Q(visible=True) \| Q(professors__in=[self.request.user]) \| Q(course = course))
	88	+ context['subjects'] = subjects
	89	+
	90	+ return context
	91	+
84	92	class DeleteView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
85	93
86	94	allowed_roles = ['professor', 'system_admin']
...	...
...	...	@@ -23,27 +23,107 @@
23	23
24	24	{% block content %}
25	25	<div class="row">
26		- <div class="col-sm-3">
27		- <img src="{{ user.image.url }}" class="img-responsive" />
	26	+ <div class="row">
	27	+ <div class="col-lg-offset-4 col-lg-2">
	28	+ <img src="" class="img-responsive center-block " alt="logo amadeus">
28	29	</div>
29		- <div class="col-sm-9">
30		- <h4>{{ user }}</h4>
31		- <span class="label label-info">{% if user.type_profile %}{{ user.get_type_profile_display }}{% else %}
32		- {% trans 'Administrator' %} {% endif %}</span>
33		- <span class="label label-primary">{{ user.get_gender_display }}</span>
34		- <span class="label label-warning">{{ user.city }} / {{ user.state }}</span>
35		- <p>
36		- <strong>{% trans 'Mail:' %} </strong> {{ user.email }}
37		- </p>
38		- <p>
39		- <strong>{% trans 'Phone:' %} </strong> {{ user.phone }}
40		- </p>
41		- <p>
42		- <strong>{% trans 'Cpf' %}: </strong> {{ user.cpf }}
43		- </p>
44		- <p>
45		- <strong>{% trans 'Birth date' %}: </strong> {{ user.birth_date }}
46		- </p>
	30	+ </div>
	31	+ <div class="row">
	32	+ <div class="col-lg-12">
	33	+ <div class="card">
	34	+ <div class="card-content">
	35	+ <div class="card-body">
	36	+ <div class="row">
	37	+ <div class="col-md-4">
	38	+ <img src="{{ user.image.url }}" class="img-responsive center-block img-circle" alt="foto perfil" style="max-height:174px">
	39	+ </div>
	40	+ <div class="col-md-8">
	41	+ <table class="table table-hover table-edited">
	42	+ <tbody>
	43	+ <tr>
	44	+ <td>Status:</td>
	45	+ <td>Offline</td>
	46	+ </tr>
	47	+ <tr>
	48	+ <td>Nome:</td>
	49	+ <td>{{user}}</td>
	50	+ </tr>
	51	+ <tr>
	52	+ <td>Login:</td>
	53	+ <td>{{user.username}}</td>
	54	+ </tr>
	55	+ <tr>
	56	+ <td>Email:</td>
	57	+ <td>{{user.email}}</td>
	58	+ </tr>
	59	+ </tbody>
	60	+ </table>
	61	+ </div>
	62	+ </div>
	63	+ <div class="row">
	64	+ <div class="col-md-10 col-md-offset-1">
	65	+ <table class="table table-hover table-edited">
	66	+ <tbody>
	67	+ <tr>
	68	+ <td>Tipo de usuário:</td>
	69	+ <td>{{use.type_profile}}</td>
	70	+ </tr>
	71	+ <tr>
	72	+ <td>CPF:</td>
	73	+ <td>{{user.cpf}}</td>
	74	+ </tr>
	75	+ <tr>
	76	+ <td>Número de telefone:</td>
	77	+ <td>{{user.phone}}</td>
	78	+ </tr>
	79	+ <tr>
	80	+ <td>Sexo:</td>
	81	+ <td>{{user.gender}}</td>
	82	+ </tr>
	83	+ <tr>
	84	+ <td>Data de Nascimento:</td>
	85	+ <td>{{user.birth_date}}</td>
	86	+ </tr>
	87	+ <tr>
	88	+ <td>Estado e Cidade:</td>
	89	+ <td>{{user.state}} - {{user.city}}</td>
	90	+ </tr>
	91	+ <tr>
	92	+ <td>Titulação:</td>
	93	+ <td>Mestrado</td>
	94	+ </tr>
	95	+ <tr>
	96	+ <td>Ano:</td>
	97	+ <td>2012</td>
	98	+ </tr>
	99	+ <tr>
	100	+ <td>Instituição:</td>
	101	+ <td>UFPE</td>
	102	+ </tr>
	103	+ <tr>
	104	+ <td>Currículo:</td>
	105	+ <td>-</td>
	106	+ </tr>
	107	+ </tbody>
	108	+ </table>
	109	+ </div>
	110	+ </div>
	111	+ </div>
	112	+ </div>
	113	+ <footer class="card-footer">
	114	+ <div class="col-md-6">
	115	+ <button class="btn btn-flat">Edit Profile</button>
	116	+ </div>
	117	+ <div class="col-md-6">
	118	+ <button class="btn btn-flat btn-danger pull-right">Delete Account</button>
	119	+ </div>
	120	+ </footer>
	121	+
	122	+ </div>
	123	+
	124	+
47	125	</div>
48	126	</div>
	127	+</div>
	128	+ </div>
49	129	{% endblock %}
...	...