Changes to the mineral practice page

three_d_viewer/templates/three_d_viewer/minerals_practice.html

@@ -6,11 +6,9 @@
         <ul>
             <li class="has-sub mainitem"><a href="#">Select a mineral</a>
             <ul>
-                                       <li><a href='#mineralOne' name="mineralOne"><span>Mineral 1</span></a></li>
+                {% for sample in active_samples %}
-                                       <li><a href='#mineralTwo' name="mineralTwo"><span>Mineral 2</span></a></li>
+                    <li>{{  sample.name }}</li>
-                                       <li><a href='#mineralThree' name="mineralThree"><span>Mineral 3</span></a></li>
+                {% endfor %}
-                                       <li><a href='#mineralFour' name="mineralFour"><span>Mineral 4</span></a></li>
-                                       <li class="last"><a href='#mineralFive' name="mineralFive"><span>Mineral 5</span></a></li>
             </ul>
             </li>
         </ul>
@@ -44,10 +42,10 @@
             <p>Info about mineral 5</p>
         </div>
     </div>
-        </div>
+</div>
-        <div id="virtualObject">
 
+<div id="virtualObject">
     <img src="images/rock_example.jpeg" class="example" />
-        </div>
+</div>
 
 {% endblock %}

three_d_viewer/urls.py

@@ -8,10 +8,11 @@ urlpatterns = patterns(
     url(r'^$', views.HomeView.as_view(), name='home'),
     url(r'^$', generic.TemplateView.as_view(template_name="three_d_viewer/home.html"), name='home'),
     url(r'^minerals_theory/$', generic.TemplateView.as_view(template_name="three_d_viewer/minerals_theory.html"), name='minerals_theory'),
-    url(r'^minerals_practice/$', generic.TemplateView.as_view(template_name="three_d_viewer/minerals_practice.html"), name='minerals_practice'),
+    url(r'^minerals_practice/$', views.MineralPracticeView.as_view(template_name="three_d_viewer/minerals_practice.html"), name='minerals_practice'),
     url(r'^minerals_selftest/$', generic.TemplateView.as_view(template_name="three_d_viewer/minerals_selftest.html"), name='minerals_selftest'),
-    url(r'^(?P<pk>\d+)/$', views.DetailView.as_view(), name='detail'),
+    url(r'^minerals/(?P<pk>\d+)/$', views.MineralPracticeView.as_view(), name='mineral_detail'),
-    url(r'^minerals/(?P<pk>\d+)/$', views.MineralDetailView.as_view(), name='mineral_detail'),
+    #url(r'^(?P<pk>\d+)/$', views.DetailView.as_view(), name='detail'),
+    #url(r'^minerals/(?P<pk>\d+)/$', views.MineralDetailView.as_view(), name='mineral_detail'),
     url(r'^media/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': settings.MEDIA_ROOT}),
 )

three_d_viewer/views.py

@@ -4,6 +4,8 @@ Define the views for the Django MVC
 
 from django import template
 from django.views import generic
+from itertools import chain
+from operator import attrgetter
 
 from three_d_viewer.models import Sample, Category, Mineral
 register = template.Library()
@@ -24,7 +26,21 @@ class HomeView(generic.ListView):
             filter(active=True).order_by('name')
         return context
 
+class MineralPracticeView(generic.ListView):
+    model = Sample
+    template_name = 'three_d_viewer/minerals_practice.html'
 
+    def get_context_data(self, **kwargs):
+        context = super(MineralPracticeView, self).get_context_data(**kwargs)
+        cat = Category.objects.get(name='Minerals')
+        #context['active_samples'] = cat.active_samples
+        result = cat.active_samples
+
+        for child in cat.active_children:
+            result = chain(result, child.active_samples)
+
+        context['active_samples'] = sorted(result, key=attrgetter('name'))
+        return context
 
 class DetailView(generic.DetailView):
     """