Update Readme.

.gitignore

@@ -2,6 +2,7 @@
 __pycache
 .DS_Store
 *_initial.py
+**/migrations/*_*.py
 .idea
 
 

README.md

@@ -42,7 +42,7 @@ The actual data can be found here: https://gitlab.ub.uni-bielefeld.de/sporada/bu
 12. Shutdown the app with the command `docker-compose down`.
 13. Change the owner rights of all files in the repository. (This step should only be necessary for linux systems.)
     - This has to be done because every process inside a docker container is always executed with root privilage. Thus the created volumes are not accessable anymore.
-    - Change the rights with `sudo chown -R $USER:$USER`.
+    - Change the rights with `sudo chown -R $USER:$USER .`.
 12. Download the folders *MdB\_data* and *outputs* from the link mentioned in [this repository](https://gitlab.ub.uni-bielefeld.de/sporada/bundesdata_markup_nlp_data).
     - Copy those into the folder *input_volume* which is located inside the web app repository on the root level.
     - If the downloaded folders are inside an archive extract the folders first.

app/speeches/management/commands/import_protocols.py

@@ -103,6 +103,9 @@ class Command(BaseCommand):
                 # self.stdout.write("\tSpeech ID is:" + str(speech.speech_id))
                 # self.stdout.write("\tPrevious Speech ID is:" + str(speech.previous_speech_id))
                 # self.stdout.write("\tNext Speech ID is:" + str(speech.next_speech_id))
+                speaker_party_then = current_e.xpath(".//damalige_fraktion")[0]
+                speech.speaker_party_then = speaker_party_then.text
+                print(speech.speaker_party_then)
                 speaker_type = current_e.xpath("//@typ")[0]
                 speech.speaker_type = speaker_type
                 speaker_id = current_e.xpath(".//redner/@id")[0]

app/speeches/models.py

@@ -38,6 +38,7 @@ class Speech(models.Model):
                                         null=True, blank=True, verbose_name="MdB ID", )
     speech_content = models.TextField(verbose_name="Redeinhalt")  # import as XML element to string
     original_string = models.TextField(verbose_name="Original String")
+    speaker_party_then = models.CharField(verbose_name="Damalige Partei", max_length=255, null=True, blank=True, default= None)
 
     def __str__(self):
         return (str(self.foreign_protocol) + " " + str(self.speech_id) + " "

app/speeches/templates/speeches/protocol.html

@@ -69,7 +69,8 @@
                             {% if speaker.name_prefix %}
                             {{speaker.name_prefix}}
                             {% endif %}
-                            {{speaker.last_name}}:</a></h5>
+                            {{speaker.last_name}}
+                            ({{speaker.party}}):</a></h5>
                     {% else %}
                     <span class="card-title">Rede von: Unbekannt<a class="tooltipped" data-position="bottom" data-tooltip="Dieses Mitglied des Bundestags konnte leider nicht automatisch erkannt werden. Grundlegende Infos zu Namen etc. können beim zugehörigen Redeeintrag unter dem Punkt Original String gefunden werden."><i
                                 class="material-icons blue-grey-text darken-4" style="margin-right: 10px;">info_outline</i></a></span>

app/speeches/templates/speeches/speech.html

@@ -14,7 +14,7 @@
                     <p class="center-align"><i class="large material-icons blue-grey-text darken-4">insert_comment</i></p>
                     <span class="card-title">Metadaten</span>
                     <ul>
-                        <li><i class="material-icons blue-grey-text darken-4" style="margin-right: 10px;">insert_drive_file</i><a href="/protokolle/protokoll/{{current_speech.foreign_protocol.protocol_id}}">Aus Protokoll:
+                        <li><a href="/protokolle/protokoll/{{current_speech.foreign_protocol.protocol_id}}"><i class="material-icons blue-grey-text darken-4" style="margin-right: 10px;">insert_drive_file</i>Aus Protokoll:
                                 {{current_speech.foreign_protocol.protocol_id}}</a></li>
                         <br />
                         <li><i class="material-icons blue-grey-text darken-4" style="margin-right: 10px;">date_range</i>Datum: {{current_speech.foreign_protocol.session_date}}</li>
@@ -64,7 +64,7 @@
                 <li>
                     <div class="collapsible-header"><i class="large material-icons blue-grey-text darken-4">insert_comment</i>Vorherige Rede als Kontext</div>
                     <div class="collapsible-body">
-                        <h6>{% if previous_speech.foreign_speaker.id %}
+                        <h5>{% if previous_speech.foreign_speaker.id %}
                             Rede von {% if previous_speech.foreign_speaker.title %}
                             {{previous_speech.foreign_speaker.title}}
                             {% endif %}
@@ -76,12 +76,24 @@
                             {{previous_speech.foreign_speaker.name_prefix}}
                             {% endif %}
                             {{previous_speech.foreign_speaker.last_name}}
-                            ({{previous_speech.foreign_speaker.party}})
                             {% else %}
                             <span class="card-title">Rede von: Unbekannt<a class="tooltipped" data-position="bottom" data-tooltip="Dieses Mitglied des Bundestags konnte leider nicht automatisch erkannt werden. Grundlegende Infos zu Namen etc. können beim zugehörigen Redeeintrag unter dem Punkt Original String gefunden werden."><i
                                         class="material-icons blue-grey-text darken-4" style="margin-right: 10px;">info_outline</i></a></span>
                             {% endif %}
-                        </h6>
+                        </h5>
+                            <hr class="blue-grey-text darken-4" />
+                            <br />
+                            <ul class="blue-grey-text darken-4">
+                                {% if previous_speech.speaker_party_then == None %}
+                                <li>Parteizugehörigkeit zum Zeitpunkt der Rede:
+                                    ({{previous_speech.foreign_speaker.party}})</li>
+                                    {% else %}
+                                <li>Parteizugehörigkeit zum Zeitpunkt der Rede:
+                                        ({{previous_speech.speaker_party_then}})</li>
+                                        {% endif %}
+                                <li>Letzte offizielle eingetragene Parteizugehörigkeit: ({{previous_speech.foreign_speaker.party}})</li>
+                            </ul>
+                            <br />
                         <span>{% autoescape off %}{{previous_speech_html}}{% endautoescape %}</span>
                     </div>
                 </li>
@@ -105,10 +117,22 @@
                         {{current_speech.foreign_speaker.name_prefix}}
                         {% endif %}
                         {{current_speech.foreign_speaker.last_name}}
-                        ({{current_speech.foreign_speaker.party}})</span>
+                    </span>
+                    <hr class="blue-grey-text darken-4" />
+                    <ul class="blue-grey-text darken-4">
+                        {% if current_speech.speaker_party_then == None %}
+                        <li>Parteizugehörigkeit zum Zeitpunkt der Rede:
+                            ({{current_speech.foreign_speaker.party}})</li>
+                        {% else %}
+                        <li>Parteizugehörigkeit zum Zeitpunkt der Rede:
+                            ({{current_speech.speaker_party_then}})</li>
+                        {% endif %}
+                        <li>Letzte offizielle eingetragene Parteizugehörigkeit: ({{current_speech.foreign_speaker.party}})</li>
+                    </ul>
                     {% else %}
                     <span class="card-title">Rede von: Unbekannt<a class="tooltipped" data-position="bottom" data-tooltip="Dieses Mitglied des Bundestags konnte leider nicht automatisch erkannt werden. Grundlegende Infos zu Namen etc. können links unter 'Original String' gelesen werden."><i
                                 class="material-icons blue-grey-text darken-4" style="margin-right: 10px;">info_outline</i></a></span>
+                    <hr class="blue-grey-text darken-4" />
                     {% endif %}
                     {% autoescape off %}
                     {{current_speech_html}}
@@ -123,7 +147,8 @@
                 <li>
                     <div class="collapsible-header"><i class="large material-icons blue-grey-text darken-4">insert_comment</i>Nächste Rede als Kontext</div>
                     <div class="collapsible-body">
-                        <h6>Rede von {% if next_speech.foreign_speaker.title %}
+                        <h5>{% if next_speech.foreign_speaker.id %}
+                            Rede von {% if next_speech.foreign_speaker.title %}
                             {{next_speech.foreign_speaker.title}}
                             {% endif %}
                             {% if next_speech.foreign_speaker.nobility %}
@@ -134,7 +159,24 @@
                             {{next_speech.foreign_speaker.name_prefix}}
                             {% endif %}
                             {{next_speech.foreign_speaker.last_name}}
-                            ({{next_speech.foreign_speaker.party}})</h6>
+                            {% else %}
+                            <span class="card-title">Rede von: Unbekannt<a class="tooltipped" data-position="bottom" data-tooltip="Dieses Mitglied des Bundestags konnte leider nicht automatisch erkannt werden. Grundlegende Infos zu Namen etc. können beim zugehörigen Redeeintrag unter dem Punkt Original String gefunden werden."><i
+                                        class="material-icons blue-grey-text darken-4" style="margin-right: 10px;">info_outline</i></a></span>
+                            {% endif %}
+                        </h5>
+                        <hr class="blue-grey-text darken-4" />
+                        <br />
+                        <ul class="blue-grey-text darken-4">
+                            {% if previous_speech.speaker_party_then == None %}
+                            <li>Parteizugehörigkeit zum Zeitpunkt der Rede:
+                                ({{next_speech.foreign_speaker.party}})</li>
+                                {% else %}
+                            <li>Parteizugehörigkeit zum Zeitpunkt der Rede:
+                                    ({{next_speech.speaker_party_then}})</li>
+                                    {% endif %}
+                            <li>Letzte offizielle eingetragene Parteizugehörigkeit: ({{next_speech.foreign_speaker.party}})</li>
+                        </ul>
+                        <br />
                         <span><span>{% autoescape off %}{{next_speech_html}}{% endautoescape %}</span>
                     </div>
                 </li>