From e9a319ee01b21e6ba393ca3488328975efd3bf86 Mon Sep 17 00:00:00 2001
From: fmareuil <fabien.mareuil@pasteur.fr>
Date: Thu, 29 Feb 2024 17:49:18 +0100
Subject: [PATCH] faq update page and type
---
ippisite/ippidb/admin.py | 2 +-
ippisite/ippidb/migrations/0077_faq_type.py | 18 +++++
ippisite/ippidb/models/ippidb.py | 5 ++
ippisite/ippidb/templates/FAQ.html | 74 ++++++++++++++++-----
ippisite/ippidb/templates/tutorials.html | 14 ++--
5 files changed, 87 insertions(+), 26 deletions(-)
create mode 100644 ippisite/ippidb/migrations/0077_faq_type.py
diff --git a/ippisite/ippidb/admin.py b/ippisite/ippidb/admin.py
index 2333c51d..fbd3dfe7 100644
--- a/ippisite/ippidb/admin.py
+++ b/ippisite/ippidb/admin.py
@@ -76,7 +76,7 @@ class ViewOnSiteModelAdmin(admin.ModelAdmin):
@admin.register(Faq)
class FaqAdmin(admin.ModelAdmin):
- list_display = ("question", "answer")
+ list_display = ("question", "answer", "type")
@admin.register(PDB)
diff --git a/ippisite/ippidb/migrations/0077_faq_type.py b/ippisite/ippidb/migrations/0077_faq_type.py
new file mode 100644
index 00000000..aa8c5cac
--- /dev/null
+++ b/ippisite/ippidb/migrations/0077_faq_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-02-29 16:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ippidb', '0076_faq'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='faq',
+ name='type',
+ field=models.CharField(choices=[('compounds', 'compounds'), ('pie', 'pie')], default='pie', max_length=10, verbose_name='type'),
+ ),
+ ]
diff --git a/ippisite/ippidb/models/ippidb.py b/ippisite/ippidb/models/ippidb.py
index 10727187..31f499b8 100644
--- a/ippisite/ippidb/models/ippidb.py
+++ b/ippisite/ippidb/models/ippidb.py
@@ -2290,5 +2290,10 @@ class Contributor(User):
class Faq(models.Model):
+ TYPES = (
+ ("compounds", "compounds"),
+ ("pie", "pie"),
+ )
question = models.TextField("Question")
answer = models.TextField("Answer")
+ type = models.CharField("type", max_length=10, choices=TYPES, default=TYPES[1][0])
diff --git a/ippisite/ippidb/templates/FAQ.html b/ippisite/ippidb/templates/FAQ.html
index ddaab300..be6d8864 100644
--- a/ippisite/ippidb/templates/FAQ.html
+++ b/ippisite/ippidb/templates/FAQ.html
@@ -7,31 +7,69 @@
<div class="inner-wrap">
<div class="container-fluid p-5">
+ <h1 class="page-title"> FAQ </h1>
+ <div class="row m-2">
+ <div class="col-sm-6">
+ <h2 class="text-center">COMPOUNDS</h2>
+ </div>
+ <div class="col-sm-6">
+ <h2 class="text-center">PROTEIN INTERACTION EXPLORER</h2>
+ </div>
+ </div>
+ <div class="row m-2">
+ <div class="col-6">
+ <div id="accordion_compounds">
+ {% for faq in faq_list %}
+ {% if faq.type == 'compounds' %}
+ <div class="card">
+ <div class="card-header" id="heading{{ faq.id }}">
+ <h5 class="mb-0">
+ <button style="white-space: normal;" class="btn btn-link collapsed"
+ data-toggle="collapse" data-target="#collapse{{ faq.id }}" aria-expanded="false"
+ aria-controls="collapse{{ faq.id }}">
+ {{ faq.question }}
+ </button>
+ </h5>
+ </div>
- <div id="accordion">
- {% for faq in faq_list %}
- <div class="card">
- <div class="card-header" id="heading{{ faq.id }}">
- <h5 class="mb-0">
- <button class="btn btn-link collapsed" data-toggle="collapse"
- data-target="#collapse{{ faq.id }}" aria-expanded="false"
- aria-controls="collapse{{ faq.id }}">
- {{ faq.question }}
- </button>
- </h5>
+ <div id="collapse{{ faq.id }}" class="collapse" aria-labelledby="heading{{ faq.id }}"
+ data-parent="#accordion_compounds">
+ <div class="card-body">
+ {{ faq.answer }}
+ </div>
+ </div>
+ </div>
+ {% endif %}
+ {% endfor %}
</div>
+ </div>
+ <div class="col-6">
+ <div id="accordion_pie">
+ {% for faq in faq_list %}
+ {% if faq.type == 'pie' %}
+ <div class="card">
+ <div class="card-header" id="heading{{ faq.id }}">
+ <h5 class="mb-0">
+ <button style="white-space: normal;" class="btn btn-link collapsed"
+ data-toggle="collapse" data-target="#collapse{{ faq.id }}" aria-expanded="false"
+ aria-controls="collapse{{ faq.id }}">
+ {{ faq.question }}
+ </button>
+ </h5>
+ </div>
- <div id="collapse{{ faq.id }}" class="collapse" aria-labelledby="heading{{ faq.id }}"
- data-parent="#accordion">
- <div class="card-body">
- {{ faq.answer }}
+ <div id="collapse{{ faq.id }}" class="collapse" aria-labelledby="heading{{ faq.id }}"
+ data-parent="#accordion_pie">
+ <div class="card-body">
+ {{ faq.answer }}
+ </div>
+ </div>
</div>
+ {% endif %}
+ {% endfor %}
</div>
</div>
-
- {% endfor %}
</div>
-
</div>
</div>
<script>
diff --git a/ippisite/ippidb/templates/tutorials.html b/ippisite/ippidb/templates/tutorials.html
index 258aecb5..8c07cda1 100644
--- a/ippisite/ippidb/templates/tutorials.html
+++ b/ippisite/ippidb/templates/tutorials.html
@@ -12,15 +12,15 @@
<main role="main">
<h1 class="page-title"> TUTORIALS </h1>
<div class="row m-2">
- <div class="col-sm-6">
+ <div class="col-6">
<h2 class="text-center">COMPOUNDS</h2>
</div>
- <div class="col-sm-6">
- <h2 class="text-center">POCKETS</h2>
+ <div class="col-6">
+ <h2 class="text-center">PROTEIN INTERACTION EXPLORER</h2>
</div>
</div>
<div class="row m-2">
- <div class="col-sm-6">
+ <div class="col-6">
<div class="card" style="max-width: 100%;">
<div class="card-header">
<h5 class="card-title text-center">Tutorial for Query mode</h5>
@@ -38,12 +38,12 @@
</div>
</div>
</div>
- <div class="col-sm-6">
+ <div class="col-6">
</div>
</div>
<div class="row m-2">
- <div class="col-sm-6">
+ <div class="col-6">
<div class="card" style="max-width: 100%;">
<div class="card-header">
<h5 class="card-title text-center">Tutorial for Contribution mode</h5>
@@ -60,7 +60,7 @@
</div>
</div>
</div>
- <div class="col-sm-6">
+ <div class="col-6">
</div>
</div>
--
GitLab