From 516d262b14584202c4a570ce3a8c33e14b27f564 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 8 Apr 2019 13:53:22 +0530
Subject: [PATCH 001/125] Revised labelset and label models

---
 funnel/models/__init__.py |  1 +
 funnel/models/label.py    | 76 +++++++++++++++++++++------------------
 funnel/models/project.py  |  4 ++-
 3 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/funnel/models/__init__.py b/funnel/models/__init__.py
index f05ffa91a..1c1a3bd65 100644
--- a/funnel/models/__init__.py
+++ b/funnel/models/__init__.py
@@ -19,3 +19,4 @@
 from .session import *
 from .user import *
 from .venue import *
+from .label import *
diff --git a/funnel/models/label.py b/funnel/models/label.py
index f20ff2cdb..cf2f884f4 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -1,67 +1,75 @@
 # -*- coding: utf-8 -*-
 
-from . import db, make_timestamp_columns, TimestampMixin, BaseScopedNameMixin
-from .profile import Profile
+from sqlalchemy.ext.orderinglist import ordering_list
+
+from . import db, BaseScopedNameMixin
 from .project import Project
 from .proposal import Proposal
 
 
 class Labelset(BaseScopedNameMixin, db.Model):
     """
-    A collection of labels, in checkbox mode (select multiple) or radio mode (select one). A profile can
-    contain multiple label sets and a Project can enable one or more sets to be used in Proposals.
+    A collection of labels, in checkbox mode (select multiple) or radio mode (select one). A project can
+    contain multiple label sets.
     """
     __tablename__ = 'labelset'
 
-    profile_id = db.Column(None, db.ForeignKey('profile.id'), nullable=False)
-    profile = db.relationship(Profile, backref=db.backref('labelsets', cascade='all, delete-orphan'))
-    parent = db.synonym('profile')
+    project_id = db.Column(None, db.ForeignKey('profile.id', ondelete='CASCADE'), nullable=False)
+    project = db.relationship(Project)  # Backref is defined in the Project model with an ordering list
+    parent = db.synonym('project')
+
+    labels = db.relationship('Label', cascade='all, delete-orphan',
+        order_by='Label.seq', collection_class=ordering_list('seq', count_from=1))
+
+    #: Sequence number for this labelset, used in UI for ordering
+    seq = db.Column(db.Integer, nullable=False)
 
+    #: Radio mode specifies that only one of the labels in this set may be applied on a project
     radio_mode = db.Column(db.Boolean, nullable=False, default=False)
+    #: Restricted model specifies that labels in this set may only be applied by someone with
+    #: an editorial role (TODO: name the role)
+    restricted = db.Column(db.Boolean, nullable=False, default=False)
 
-    __table_args__ = (db.UniqueConstraint('profile_id', 'name'),)
+    __table_args__ = (db.UniqueConstraint('project_id', 'name'),)
 
     def __repr__(self):
-        return "<Labelset %s in %s>" % (self.name, self.profile.name)
+        return "<Labelset %s in %s>" % (self.name, self.project.name)
 
 
 proposal_label = db.Table(
     'proposal_label', db.Model.metadata,
-    *(make_timestamp_columns() + (
-        db.Column('proposal_id', None, db.ForeignKey('proposal.id'), nullable=False, primary_key=True),
-        db.Column('label_id', None, db.ForeignKey('label.id'), nullable=False, primary_key=True)
-        )))
+    db.Column('proposal_id', None, db.ForeignKey('proposal.id', ondelete='CASCADE'), nullable=False, primary_key=True),
+    db.Column('label_id', None, db.ForeignKey('label.id', ondelete='CASCADE'), nullable=False, primary_key=True, index=True),
+    db.Column('created_at', db.DateTime, default=db.func.utcnow())
+)
 
 
 class Label(BaseScopedNameMixin, db.Model):
     __tablename__ = 'label'
 
-    labelset_id = db.Column(None, db.ForeignKey('labelset.id'), nullable=False)
+    labelset_id = db.Column(None, db.ForeignKey('labelset.id', ondelete='CASCADE'), nullable=False)
     labelset = db.relationship(Labelset)
 
-    proposals = db.relationship(Proposal, secondary=proposal_label, backref='labels')
+    #: Sequence number for this label, used in UI for ordering
+    seq = db.Column(db.Integer, nullable=False)
+
+    #: Icon for displaying in space-constrained UI. Contains emoji
+    #: an emoji, or up to three ASCII characters picked from the label's title
+    icon_emoji = db.Column(db.Unicode(1), nullable=True)
+
+    #: Proposals that this label is attached to
+    proposals = db.relationship(Proposal, secondary=proposal_label, lazy='dynamic', backref='labels')
 
     __table_args__ = (db.UniqueConstraint('labelset_id', 'name'),)
 
     def __repr__(self):
         return "<Label %s/%s>" % (self.labelset.name, self.name)
 
-
-class ProjectLabelset(TimestampMixin, db.Model):
-    __tablename__ = 'project_labelset'
-
-    project_id = db.Column(None, db.ForeignKey('project.id'), nullable=False, primary_key=True)
-    project = db.relationship(Project, backref=db.backref('labelset_links', cascade='all, delete-orphan'))
-    labelset_id = db.Column(None, db.ForeignKey('labelset.id'), nullable=False, primary_key=True)
-    labelset = db.relationship(Labelset, backref=db.backref('project_links', cascade='all, delete-orphan'))
-    seq = db.Column(db.Integer, nullable=False, default=0)
-
-
-# TODO: Should this be just a secondary table?
-# class ProposalLabel(TimestampMixin, db.Model):
-#     __tablename__ = 'proposal_label'
-
-#     proposal_id = db.Column(None, db.ForeignKey('proposal.id'), nullable=False, primary_key=True)
-#     proposal = db.relationship(Proposal, backref=db.backref('label_links', cascade='all, delete-orphan'))
-#     label_id = db.Column(None, db.ForeignKey('label.id'), nullable=False, primary_key=True)
-#     label = db.relationship(Label, backref=db.backref('proposal_links', cascade='all, delete-orphan'))
+    @property
+    def icon(self):
+        result = self.icon_emoji
+        if not result:
+            result = ''.join(w[0] for w in self.title.strip().title().split(None, 2))
+            if len(result) <= 1:
+                result = self.title.strip()[:2]
+        return result
diff --git a/funnel/models/project.py b/funnel/models/project.py
index b690dad63..988e81f7e 100644
--- a/funnel/models/project.py
+++ b/funnel/models/project.py
@@ -131,7 +131,9 @@ class Project(UuidMixin, BaseScopedNameMixin, db.Model):
     labels = db.Column(JsonDict, nullable=False, server_default='{}')
 
     venues = db.relationship('Venue', cascade='all, delete-orphan',
-            order_by='Venue.seq', collection_class=ordering_list('seq', count_from=1))
+        order_by='Venue.seq', collection_class=ordering_list('seq', count_from=1))
+    labelsets = db.relationship('Labelset', cascade='all, delete-orphan',
+        order_by='Labelset.seq', collection_class=ordering_list('seq', count_from=1))
 
     featured_sessions = db.relationship(
         'Session',

From 49af3f60575a761335c87229aaa3a4f592e111f4 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 8 Apr 2019 14:10:01 +0530
Subject: [PATCH 002/125] Fix docstrings, add columns

---
 funnel/models/label.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index cf2f884f4..0e93f246c 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -24,12 +24,22 @@ class Labelset(BaseScopedNameMixin, db.Model):
     #: Sequence number for this labelset, used in UI for ordering
     seq = db.Column(db.Integer, nullable=False)
 
+    # A single-line description of this labelset, shown when applying labels
+    description = db.Column(db.UnicodeText, nullable=False)
+
     #: Radio mode specifies that only one of the labels in this set may be applied on a project
     radio_mode = db.Column(db.Boolean, nullable=False, default=False)
-    #: Restricted model specifies that labels in this set may only be applied by someone with
+
+    #: Restricted mode specifies that labels in this set may only be applied by someone with
     #: an editorial role (TODO: name the role)
     restricted = db.Column(db.Boolean, nullable=False, default=False)
 
+    #: Required mode specifies that a label from this set must be applied on a proposal.
+    #: This is not foolproof and can be violated under a variety of conditions including
+    #: (a) this flag being set after a proposal is created, and (b) a proposal being moved
+    #: across projects
+    required = db.Column(db.Boolean, nullable=False, default=False)
+
     __table_args__ = (db.UniqueConstraint('project_id', 'name'),)
 
     def __repr__(self):
@@ -54,7 +64,6 @@ class Label(BaseScopedNameMixin, db.Model):
     seq = db.Column(db.Integer, nullable=False)
 
     #: Icon for displaying in space-constrained UI. Contains emoji
-    #: an emoji, or up to three ASCII characters picked from the label's title
     icon_emoji = db.Column(db.Unicode(1), nullable=True)
 
     #: Proposals that this label is attached to
@@ -67,9 +76,15 @@ def __repr__(self):
 
     @property
     def icon(self):
+        """
+        Returns an icon for displaying the label in space-constrained UI.
+        If an emoji icon has been specified, use it. If not, create initials
+        from the title (up to 3). If the label is a single word, returns the
+        first three characters.
+        """
         result = self.icon_emoji
         if not result:
             result = ''.join(w[0] for w in self.title.strip().title().split(None, 2))
             if len(result) <= 1:
-                result = self.title.strip()[:2]
+                result = self.title.strip()[:3]
         return result

From 5dd3e913653a643d7e6d3e6edc88f3f84601f7ce Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 8 Apr 2019 14:39:56 +0530
Subject: [PATCH 003/125] Fix foreignkey

---
 funnel/models/label.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index 0e93f246c..61f6e9b70 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -10,11 +10,11 @@
 class Labelset(BaseScopedNameMixin, db.Model):
     """
     A collection of labels, in checkbox mode (select multiple) or radio mode (select one). A project can
-    contain multiple label sets.
+    contain multiple labelsets.
     """
     __tablename__ = 'labelset'
 
-    project_id = db.Column(None, db.ForeignKey('profile.id', ondelete='CASCADE'), nullable=False)
+    project_id = db.Column(None, db.ForeignKey('project.id', ondelete='CASCADE'), nullable=False)
     project = db.relationship(Project)  # Backref is defined in the Project model with an ordering list
     parent = db.synonym('project')
 

From 169cb1d2cc8195f59f805e97cb2e0e123a424048 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Mon, 8 Apr 2019 14:49:17 +0530
Subject: [PATCH 004/125] added migration for labels

---
 .../0b25df40d307_add_labels_and_labelsets.py  | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 migrations/versions/0b25df40d307_add_labels_and_labelsets.py

diff --git a/migrations/versions/0b25df40d307_add_labels_and_labelsets.py b/migrations/versions/0b25df40d307_add_labels_and_labelsets.py
new file mode 100644
index 000000000..b44329af4
--- /dev/null
+++ b/migrations/versions/0b25df40d307_add_labels_and_labelsets.py
@@ -0,0 +1,62 @@
+"""add labels and labelsets
+
+Revision ID: 0b25df40d307
+Revises: ef93d256a8cf
+Create Date: 2019-04-08 14:44:05.164533
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0b25df40d307'
+down_revision = 'ef93d256a8cf'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.create_table('labelset',
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(), nullable=False),
+        sa.Column('project_id', sa.Integer(), nullable=False),
+        sa.Column('seq', sa.Integer(), nullable=False),
+        sa.Column('description', sa.UnicodeText(), nullable=False),
+        sa.Column('radio_mode', sa.Boolean(), nullable=False),
+        sa.Column('restricted', sa.Boolean(), nullable=False),
+        sa.Column('required', sa.Boolean(), nullable=False),
+        sa.Column('name', sa.Unicode(length=250), nullable=False),
+        sa.Column('title', sa.Unicode(length=250), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(['project_id'], ['profile.id'], ondelete='CASCADE'),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('project_id', 'name')
+    )
+    op.create_table('label',
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(), nullable=False),
+        sa.Column('labelset_id', sa.Integer(), nullable=False),
+        sa.Column('seq', sa.Integer(), nullable=False),
+        sa.Column('icon_emoji', sa.Unicode(length=1), nullable=True),
+        sa.Column('name', sa.Unicode(length=250), nullable=False),
+        sa.Column('title', sa.Unicode(length=250), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(['labelset_id'], ['labelset.id'], ondelete='CASCADE'),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('labelset_id', 'name')
+    )
+    op.create_table('proposal_label',
+        sa.Column('proposal_id', sa.Integer(), nullable=False),
+        sa.Column('label_id', sa.Integer(), nullable=False),
+        sa.Column('created_at', sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(['label_id'], ['label.id'], ondelete='CASCADE'),
+        sa.ForeignKeyConstraint(['proposal_id'], ['proposal.id'], ondelete='CASCADE'),
+        sa.PrimaryKeyConstraint('proposal_id', 'label_id')
+    )
+    op.create_index(op.f('ix_proposal_label_label_id'), 'proposal_label', ['label_id'], unique=False)
+
+
+def downgrade():
+    op.drop_index(op.f('ix_proposal_label_label_id'), table_name='proposal_label')
+    op.drop_table('proposal_label')
+    op.drop_table('label')
+    op.drop_table('labelset')

From 239fa9a2ad62a9cb6cf042dc9d1a80b8f5901574 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Mon, 8 Apr 2019 16:38:20 +0530
Subject: [PATCH 005/125] added tests for assigning labels

---
 funnel/models/label.py            |  1 +
 funnel/models/proposal.py         | 20 ++++++++-
 tests/conftest.py                 | 72 ++++++++++++++++++++++++++++++-
 tests/unit/models/test_label.py   | 44 +++++++++++++++++++
 tests/unit/models/test_profile.py |  2 +
 tests/unit/models/test_project.py |  2 +
 6 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 tests/unit/models/test_label.py

diff --git a/funnel/models/label.py b/funnel/models/label.py
index 61f6e9b70..c9cc8ee95 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -59,6 +59,7 @@ class Label(BaseScopedNameMixin, db.Model):
 
     labelset_id = db.Column(None, db.ForeignKey('labelset.id', ondelete='CASCADE'), nullable=False)
     labelset = db.relationship(Labelset)
+    parent = db.synonym('labelset')
 
     #: Sequence number for this label, used in UI for ordering
     seq = db.Column(db.Integer, nullable=False)
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 13c64920b..71a39262d 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -167,6 +167,9 @@ class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
         'reviewer': {
             'read': {
                 'email', 'phone'
+                },
+            'call': {
+                'assign_label'
                 }
             }
         }
@@ -344,8 +347,6 @@ def permissions(self, user, inherited=None):
                     perms.add('decline-proposal')  # Decline speaking
         return perms
 
-    # Roles
-
     def roles_for(self, actor=None, anchors=()):
         roles = super(Proposal, self).roles_for(actor, anchors)
         if self.speaker and self.speaker == actor:
@@ -357,6 +358,21 @@ def roles_for(self, actor=None, anchors=()):
             roles.remove('reader')  # https://github.com/hasgeek/funnel/pull/220#discussion_r168724439
         return roles
 
+    def assign_label(self, label):
+        """
+        Assign the given label to current proposal
+        """
+        if label.labelset.radio_mode:
+            existing_labels = set(label.labelset.labels).intersection(set(self.labels))
+            if existing_labels:
+                # the labelset is in radio mode and one of it's labels are
+                # already assigned to this proposal. We need to
+                # remove the older label and assign given label.
+                existing_label = existing_labels.pop()
+                self.labels.remove(existing_label)
+        # labelset is not in radio mode, so we can assign label to proposal
+        self.labels.append(label)
+
 
 class ProposalRedirect(TimestampMixin, db.Model):
     __tablename__ = 'proposal_redirect'
diff --git a/tests/conftest.py b/tests/conftest.py
index 19be0d7d3..cba406a7f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
+
 import pytest
 from funnel import app as hasgeekapp, db
-from funnel.models import Profile, Project, User
+from funnel.models import Profile, Project, User, Label, Labelset, Proposal
 
 
 @pytest.fixture(scope='session')
@@ -57,3 +59,71 @@ def new_project(test_db, new_profile, new_user):
     test_db.session.add(project)
     test_db.session.commit()
     return project
+
+
+@pytest.fixture(scope='module')
+def new_labelset(test_db, new_project):
+    labelset_a = Labelset(
+        title=u"Labelset A", project=new_project,
+        description=u"A test labelset", radio_mode=False,
+        restricted=False, required=False
+    )
+    new_project.labelsets.append(labelset_a)
+    test_db.session.add(labelset_a)
+    test_db.session.commit()
+
+    label_a1 = Label(
+        title=u"Label A1", icon_emoji=u"👍", labelset=labelset_a
+    )
+    labelset_a.labels.append(label_a1)
+    test_db.session.add(label_a1)
+    test_db.session.commit()
+
+    label_a2 = Label(
+        title=u"Label A2", labelset=labelset_a
+    )
+    labelset_a.labels.append(label_a2)
+    test_db.session.add(label_a2)
+    test_db.session.commit()
+
+    return labelset_a
+
+
+@pytest.fixture(scope='module')
+def new_labelset_radio(test_db, new_project):
+    labelset_b = Labelset(
+        title=u"Labelset B", project=new_project,
+        description=u"A test labelset", radio_mode=True,
+        restricted=False, required=False
+    )
+    new_project.labelsets.append(labelset_b)
+    test_db.session.add(labelset_b)
+    test_db.session.commit()
+
+    label_b1 = Label(
+        title=u"Label B1", icon_emoji=u"👍", labelset=labelset_b
+    )
+    labelset_b.labels.append(label_b1)
+    test_db.session.add(label_b1)
+    test_db.session.commit()
+
+    label_b2 = Label(
+        title=u"Label B2", labelset=labelset_b
+    )
+    labelset_b.labels.append(label_b2)
+    test_db.session.add(label_b2)
+    test_db.session.commit()
+
+    return labelset_b
+
+
+@pytest.fixture(scope='module')
+def new_proposal(test_db, new_user, new_project, new_labelset):
+    proposal = Proposal(
+        user=new_user, speaker=new_user, project=new_project,
+        title=u"Test Proposal", description=u"Test proposal description",
+        location=u"Bangalore"
+    )
+    test_db.session.add(proposal)
+    test_db.session.commit()
+    return proposal
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
new file mode 100644
index 000000000..ebdb60c9d
--- /dev/null
+++ b/tests/unit/models/test_label.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+from funnel.models import Label
+
+
+class TestLabels(object):
+    def test_labelset_from_fixture(self, test_client, test_db, new_labelset):
+        assert new_labelset.title == u"Labelset A"
+        assert new_labelset.name == u"labelset-a"
+        assert new_labelset.seq == 1
+
+    def test_label_from_fixture(self, test_client, test_db, new_labelset):
+        assert len(new_labelset.labels) > 0
+        label_a1 = new_labelset.labels[0]
+        assert label_a1.title == u"Label A1"
+        assert label_a1.name == u"label-a1"
+        assert label_a1.icon_emoji == u"👍"
+        assert label_a1.icon == u"👍"
+
+    def test_proposal_assignment(self, test_client, test_db, new_labelset, new_proposal):
+        label_a1 = new_labelset.labels[0]
+        label_a2 = new_labelset.labels[1]
+        new_proposal.assign_label(label_a1)
+        assert label_a1 in new_proposal.labels
+
+        new_proposal.assign_label(label_a2)
+        # because labelset_a is not in radio mode,
+        # both labels will exist
+        assert label_a1 in new_proposal.labels
+        assert label_a2 in new_proposal.labels
+
+    def test_proposal_assignment_radio(self, test_client, test_db, new_labelset_radio, new_proposal):
+        label_a1 = new_labelset_radio.labels[0]
+        label_a2 = new_labelset_radio.labels[1]
+        new_proposal.assign_label(label_a1)
+        assert label_a1 in new_proposal.labels
+
+        new_proposal.assign_label(label_a2)
+        # because labelset_a is in radio mode,
+        # label_a2 will replace label_a1
+        # label_a1 will not exist in ``.labels`
+        assert label_a1 not in new_proposal.labels
+        assert label_a2 in new_proposal.labels
+
diff --git a/tests/unit/models/test_profile.py b/tests/unit/models/test_profile.py
index c9b821cbf..21e1c8215 100644
--- a/tests/unit/models/test_profile.py
+++ b/tests/unit/models/test_profile.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import pytest
 from furl import furl
 from sqlalchemy.exc import StatementError
diff --git a/tests/unit/models/test_project.py b/tests/unit/models/test_project.py
index eb5204a43..bd40f4cdb 100644
--- a/tests/unit/models/test_project.py
+++ b/tests/unit/models/test_project.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from funnel.models import Project
 
 

From c1b655e2b72af1df1ecea8e7877917fe421e1334 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 9 Apr 2019 09:32:30 +0530
Subject: [PATCH 006/125] added tests for radio labelsets

---
 funnel/models/proposal.py       |  2 ++
 tests/conftest.py               | 40 +++++++++------------------------
 tests/unit/models/test_label.py | 10 ++++++---
 3 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 71a39262d..65d151aa5 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -362,6 +362,8 @@ def assign_label(self, label):
         """
         Assign the given label to current proposal
         """
+        if label in self.labels:
+            return
         if label.labelset.radio_mode:
             existing_labels = set(label.labelset.labels).intersection(set(self.labels))
             if existing_labels:
diff --git a/tests/conftest.py b/tests/conftest.py
index cba406a7f..463ad4127 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -4,6 +4,8 @@
 from funnel import app as hasgeekapp, db
 from funnel.models import Profile, Project, User, Label, Labelset, Proposal
 
+# Scope: session
+# These fixtures are run before every test session
 
 @pytest.fixture(scope='session')
 def test_client():
@@ -34,6 +36,8 @@ def test_db():
     db.session.remove()
     db.drop_all()
 
+# Scope: module
+# These fixtures are executed before every test module
 
 @pytest.fixture(scope='module')
 def new_user(test_db):
@@ -60,8 +64,12 @@ def new_project(test_db, new_profile, new_user):
     test_db.session.commit()
     return project
 
+# Scope: function
+# These fixtures are run before every test function,
+# so that changes made to the objects they return in one test function
+# doesn't affect another test function.
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope='function')
 def new_labelset(test_db, new_project):
     labelset_a = Labelset(
         title=u"Labelset A", project=new_project,
@@ -89,35 +97,7 @@ def new_labelset(test_db, new_project):
     return labelset_a
 
 
-@pytest.fixture(scope='module')
-def new_labelset_radio(test_db, new_project):
-    labelset_b = Labelset(
-        title=u"Labelset B", project=new_project,
-        description=u"A test labelset", radio_mode=True,
-        restricted=False, required=False
-    )
-    new_project.labelsets.append(labelset_b)
-    test_db.session.add(labelset_b)
-    test_db.session.commit()
-
-    label_b1 = Label(
-        title=u"Label B1", icon_emoji=u"👍", labelset=labelset_b
-    )
-    labelset_b.labels.append(label_b1)
-    test_db.session.add(label_b1)
-    test_db.session.commit()
-
-    label_b2 = Label(
-        title=u"Label B2", labelset=labelset_b
-    )
-    labelset_b.labels.append(label_b2)
-    test_db.session.add(label_b2)
-    test_db.session.commit()
-
-    return labelset_b
-
-
-@pytest.fixture(scope='module')
+@pytest.fixture(scope='function')
 def new_proposal(test_db, new_user, new_project, new_labelset):
     proposal = Proposal(
         user=new_user, speaker=new_user, project=new_project,
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index ebdb60c9d..472317185 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -29,9 +29,13 @@ def test_proposal_assignment(self, test_client, test_db, new_labelset, new_propo
         assert label_a1 in new_proposal.labels
         assert label_a2 in new_proposal.labels
 
-    def test_proposal_assignment_radio(self, test_client, test_db, new_labelset_radio, new_proposal):
-        label_a1 = new_labelset_radio.labels[0]
-        label_a2 = new_labelset_radio.labels[1]
+    def test_proposal_assignment_radio(self, test_client, test_db, new_labelset, new_proposal):
+        new_labelset.radio_mode = True
+        test_db.session.add(new_labelset)
+        test_db.session.commit()
+
+        label_a1 = new_labelset.labels[0]
+        label_a2 = new_labelset.labels[1]
         new_proposal.assign_label(label_a1)
         assert label_a1 in new_proposal.labels
 

From f06ebcde602914a0658d5ed986945bbb3b708e4b Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Wed, 10 Apr 2019 08:52:14 +0530
Subject: [PATCH 007/125] added mock usermanager for auth testing

---
 instance/testing.py             |  1 +
 tests/conftest.py               | 73 +++++++++++++++++++++++++++++----
 tests/unit/models/test_label.py |  3 --
 tests/unit/models/test_user.py  |  9 ++++
 4 files changed, 74 insertions(+), 12 deletions(-)
 create mode 100644 tests/unit/models/test_user.py

diff --git a/instance/testing.py b/instance/testing.py
index 2fd23d195..c1d28b343 100644
--- a/instance/testing.py
+++ b/instance/testing.py
@@ -9,3 +9,4 @@
 UPLOAD_FOLDER = '/tmp'
 TIMEZONE = 'Asia/Kolkata'
 RQ_LOW_URL = 'redis://localhost:6379/0'
+ASSET_BASE_PATH = "build"
diff --git a/tests/conftest.py b/tests/conftest.py
index 463ad4127..6da3e0cdf 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,16 +1,59 @@
 # -*- coding: utf-8 -*-
 
+from flask import Flask
 import pytest
-from funnel import app as hasgeekapp, db
-from funnel.models import Profile, Project, User, Label, Labelset, Proposal
+import uuid
+import coaster.app
+from coaster.auth import add_auth_attribute
+from flask_lastuser import Lastuser
+from flask_lastuser.sqlalchemy import UserManager
+from funnel.models import db, Profile, Project, User, Label, Labelset, Proposal, Team
+
+
+class UserManagerMock(UserManager):
+    def __init__(self, db, usermodel, teammodel=None):
+        """
+        This is a mocked usermanager that does no actual work but to just
+        send back the test user so that the test user appears logged in
+        without any actual authentication taking place.
+        """
+        super(UserManagerMock, self).__init__(db, usermodel, teammodel)
+        self._user = None
+
+    def load_user(self, userid, uuid=None, create=False):
+        if self._user is None:
+            self._user = self.usermodel.query.filter_by(username=u"testuser").first()
+        return self._user
+
+    def login_listener(self, userinfo, token):
+        return self.load_user('testuserid')
+
+    def update_teams(self, user):
+        pass
+
+    def before_request(self):
+        add_auth_attribute('user', self.load_user('testuserid'))
+
+
+flask_app = Flask(__name__, instance_relative_config=True)
+lastuser = Lastuser()
+# this sets the mock usermanager up for use
+lastuser.init_usermanager(UserManagerMock(db, User, Team))
+coaster.app.init_app(flask_app)
+db.init_app(flask_app)
+lastuser.init_app(flask_app)
+
+
+@flask_app.route('/usertest')
+def user_test():
+    from coaster.auth import current_auth
+    return current_auth.user.username if current_auth.user is not None else "anon"
 
 # Scope: session
 # These fixtures are run before every test session
 
 @pytest.fixture(scope='session')
 def test_client():
-    flask_app = hasgeekapp
-
     # Flask provides a way to test your application by exposing the Werkzeug test Client
     # and handling the context locals for you.
     testing_client = flask_app.test_client()
@@ -26,12 +69,13 @@ def test_client():
 
 
 @pytest.fixture(scope='session')
-def test_db():
+def test_db(test_client):
     # Create the database and the database table
     db.create_all()
 
     yield db  # this is where the testing happens!
 
+    # anything after yield is teardown code
     db.session.rollback()
     db.session.remove()
     db.drop_all()
@@ -48,18 +92,29 @@ def new_user(test_db):
 
 
 @pytest.fixture(scope='module')
-def new_profile(test_db):
-    profile = Profile(title=u"Test Profile", description=u"Test Description")
+def new_team(test_db, new_user):
+    team = Team(title=u"Owners", owners=True, org_uuid=uuid.uuid4())
+    test_db.session.add(team)
+    team.users.append(new_user)
+    test_db.session.commit()
+    return team
+
+
+@pytest.fixture(scope='module')
+def new_profile(test_db, new_team):
+    profile = Profile(title=u"Test Profile", description=u"Test Description",
+    admin_team=new_team)
     test_db.session.add(profile)
     test_db.session.commit()
     return profile
 
 
 @pytest.fixture(scope='module')
-def new_project(test_db, new_profile, new_user):
+def new_project(test_db, new_profile, new_user, new_team):
     project = Project(
         profile=new_profile, user=new_user, title=u"Test Project",
-        tagline=u"Test tagline", description=u"Test description")
+        tagline=u"Test tagline", description=u"Test description",
+        admin_team=new_team, review_team=new_team, checkin_team=new_team)
     test_db.session.add(project)
     test_db.session.commit()
     return project
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index 472317185..4fd8ec055 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from funnel.models import Label
-
 
 class TestLabels(object):
     def test_labelset_from_fixture(self, test_client, test_db, new_labelset):
@@ -45,4 +43,3 @@ def test_proposal_assignment_radio(self, test_client, test_db, new_labelset, new
         # label_a1 will not exist in ``.labels`
         assert label_a1 not in new_proposal.labels
         assert label_a2 in new_proposal.labels
-
diff --git a/tests/unit/models/test_user.py b/tests/unit/models/test_user.py
new file mode 100644
index 000000000..00f4fcef9
--- /dev/null
+++ b/tests/unit/models/test_user.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+
+class TestUser(object):
+    def test_admin_role(self, test_client, test_db, new_profile):
+        with test_client as c:
+            rv = c.get('/usertest')
+            assert rv.data == u"testuser"
+            assert new_profile.current_roles.admin

From cd4e894ead642c356df66b8ee32733826e442954 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Wed, 10 Apr 2019 09:06:29 +0530
Subject: [PATCH 008/125] updated scope for user, team, profile and project
 fixture

---
 tests/conftest.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 6da3e0cdf..4a0948052 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -80,10 +80,8 @@ def test_db(test_client):
     db.session.remove()
     db.drop_all()
 
-# Scope: module
-# These fixtures are executed before every test module
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope='session')
 def new_user(test_db):
     user = User(username=u"testuser", email=u"test@example.com")
     test_db.session.add(user)
@@ -91,7 +89,7 @@ def new_user(test_db):
     return user
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope='session')
 def new_team(test_db, new_user):
     team = Team(title=u"Owners", owners=True, org_uuid=uuid.uuid4())
     test_db.session.add(team)
@@ -100,7 +98,7 @@ def new_team(test_db, new_user):
     return team
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope='session')
 def new_profile(test_db, new_team):
     profile = Profile(title=u"Test Profile", description=u"Test Description",
     admin_team=new_team)
@@ -109,7 +107,7 @@ def new_profile(test_db, new_team):
     return profile
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope='session')
 def new_project(test_db, new_profile, new_user, new_team):
     project = Project(
         profile=new_profile, user=new_user, title=u"Test Project",

From 87b1f623f437dd6811c1872fd8afc555e491de7d Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Wed, 10 Apr 2019 16:12:14 +0530
Subject: [PATCH 009/125] logging in without dummy usermanager

---
 instance/testing.py            |  2 +-
 tests/conftest.py              | 62 +++++++++++++++++++---------------
 tests/unit/models/test_user.py |  6 ++--
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/instance/testing.py b/instance/testing.py
index c1d28b343..fc9114317 100644
--- a/instance/testing.py
+++ b/instance/testing.py
@@ -5,7 +5,7 @@
 LASTUSER_SERVER = 'https://auth.hasgeek.com'
 LASTUSER_CLIENT_ID = ''
 LASTUSER_CLIENT_SECRET = ''
-
+LASTUSER_USE_SESSIONS = False
 UPLOAD_FOLDER = '/tmp'
 TIMEZONE = 'Asia/Kolkata'
 RQ_LOW_URL = 'redis://localhost:6379/0'
diff --git a/tests/conftest.py b/tests/conftest.py
index 4a0948052..886d90d49 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -10,35 +10,10 @@
 from funnel.models import db, Profile, Project, User, Label, Labelset, Proposal, Team
 
 
-class UserManagerMock(UserManager):
-    def __init__(self, db, usermodel, teammodel=None):
-        """
-        This is a mocked usermanager that does no actual work but to just
-        send back the test user so that the test user appears logged in
-        without any actual authentication taking place.
-        """
-        super(UserManagerMock, self).__init__(db, usermodel, teammodel)
-        self._user = None
-
-    def load_user(self, userid, uuid=None, create=False):
-        if self._user is None:
-            self._user = self.usermodel.query.filter_by(username=u"testuser").first()
-        return self._user
-
-    def login_listener(self, userinfo, token):
-        return self.load_user('testuserid')
-
-    def update_teams(self, user):
-        pass
-
-    def before_request(self):
-        add_auth_attribute('user', self.load_user('testuserid'))
-
-
 flask_app = Flask(__name__, instance_relative_config=True)
 lastuser = Lastuser()
 # this sets the mock usermanager up for use
-lastuser.init_usermanager(UserManagerMock(db, User, Team))
+lastuser.init_usermanager(UserManager(db, User, Team))
 coaster.app.init_app(flask_app)
 db.init_app(flask_app)
 lastuser.init_app(flask_app)
@@ -49,6 +24,23 @@ def user_test():
     from coaster.auth import current_auth
     return current_auth.user.username if current_auth.user is not None else "anon"
 
+
+TEST_DATA = {
+    'users': {
+        'testuser': {
+            'username': u"testuser",
+            'email': u"testuser@example.com",
+        },
+        'testuser2': {
+            'username': u"testuser2",
+            'email': u"testuser2@example.com",
+        },
+        'testuser3': {
+            'username': u"testuser3",
+            'email': u"testuser3@example.com",
+        },
+    }
+}
 # Scope: session
 # These fixtures are run before every test session
 
@@ -83,7 +75,23 @@ def test_db(test_client):
 
 @pytest.fixture(scope='session')
 def new_user(test_db):
-    user = User(username=u"testuser", email=u"test@example.com")
+    user = User(**TEST_DATA['users']['testuser'])
+    test_db.session.add(user)
+    test_db.session.commit()
+    return user
+
+
+@pytest.fixture(scope='session')
+def new_user2(test_db):
+    user = User(**TEST_DATA['users']['testuser2'])
+    test_db.session.add(user)
+    test_db.session.commit()
+    return user
+
+
+@pytest.fixture(scope='session')
+def new_user3(test_db):
+    user = User(**TEST_DATA['users']['testuser3'])
     test_db.session.add(user)
     test_db.session.commit()
     return user
diff --git a/tests/unit/models/test_user.py b/tests/unit/models/test_user.py
index 00f4fcef9..9ec1ee7ba 100644
--- a/tests/unit/models/test_user.py
+++ b/tests/unit/models/test_user.py
@@ -2,8 +2,10 @@
 
 
 class TestUser(object):
-    def test_admin_role(self, test_client, test_db, new_profile):
+    def test_admin_role(self, test_client, test_db, new_user, new_profile):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
         with test_client as c:
             rv = c.get('/usertest')
-            assert rv.data == u"testuser"
+            assert rv.data == new_user.username
             assert new_profile.current_roles.admin

From 7b406397c47a15811d1314cd65b1fac03688a81d Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Thu, 11 Apr 2019 14:22:02 +0530
Subject: [PATCH 010/125] Add manage label page(WIP) (#394)

* Add manage label page(WIP)

* created views for labelsets and labels

* Minor template changes
---
 funnel/assets/js/proposal.js                  |  15 ++
 funnel/assets/package-lock.json               |  46 +++--
 funnel/assets/package.json                    |   1 +
 funnel/forms/__init__.py                      |   1 +
 funnel/forms/label.py                         |  35 ++++
 funnel/models/label.py                        |  30 ++++
 funnel/models/project.py                      |  16 +-
 funnel/static/css/app.css                     |  23 ++-
 funnel/static/sass/_proposal.scss             |  23 ++-
 funnel/templates/labels.html.jinja2           |  60 +++++++
 funnel/templates/macros.html.jinja2           |   2 +-
 funnel/templates/proposal.html.jinja2         |  37 +---
 funnel/views/__init__.py                      |   2 +-
 funnel/views/label.py                         | 163 ++++++++++++++++++
 .../0b25df40d307_add_labels_and_labelsets.py  |   3 +-
 15 files changed, 395 insertions(+), 62 deletions(-)
 create mode 100644 funnel/forms/label.py
 create mode 100644 funnel/templates/labels.html.jinja2
 create mode 100644 funnel/views/label.py

diff --git a/funnel/assets/js/proposal.js b/funnel/assets/js/proposal.js
index 819735053..2a4120e10 100644
--- a/funnel/assets/js/proposal.js
+++ b/funnel/assets/js/proposal.js
@@ -1,3 +1,5 @@
+import hexRgb from 'hex-rgb';
+
 export const Comments = {
   init(pageURL) {
     $('.comment .js-collapse').click(function() {
@@ -101,9 +103,22 @@ export const Video = {
   },
 };
 
+export const Labels = {
+  init() {
+    $.each($('.js-labels'), function(index, label){
+      let bgcolor = $(label).data('bgcolor');
+      let rgbBgcolor = hexRgb(bgcolor, {format: 'array'});
+      let cssBgcolor = `rgba(${rgbBgcolor[0]}, ${rgbBgcolor[1]}, ${rgbBgcolor[2]}, 0.6)`;
+      $(label).css('background-color', cssBgcolor);
+      $(label).css('border-color', bgcolor);
+    });
+  },
+};
+
 $(() => {
   window. HasGeek.ProposalInit = function ({pageUrl, videoWrapper= '', videoUrl= ''}) {
     Comments.init(pageUrl);
+    Labels.init();
 
     if (videoWrapper) {
       Video.embedIframe(videoWrapper, videoUrl);
diff --git a/funnel/assets/package-lock.json b/funnel/assets/package-lock.json
index a173b1602..eb015915f 100644
--- a/funnel/assets/package-lock.json
+++ b/funnel/assets/package-lock.json
@@ -2659,7 +2659,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2680,12 +2681,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2700,17 +2703,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2827,7 +2833,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2839,6 +2846,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2853,6 +2861,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2860,12 +2869,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -2884,6 +2895,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2964,7 +2976,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2976,6 +2989,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3061,7 +3075,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3097,6 +3112,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3116,6 +3132,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3159,12 +3176,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3356,6 +3375,11 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "hex-rgb": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.0.0.tgz",
+      "integrity": "sha512-7z7WxdbS99/vesuH/I4FkJJ+tX/CTipjbQeQ/qqLe2I2XT64f7FsDd3EtJiz4NFczaCjOvYIMJL0fJLHnJQKcg=="
+    },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
diff --git a/funnel/assets/package.json b/funnel/assets/package.json
index 6cef6b8e4..102740080 100644
--- a/funnel/assets/package.json
+++ b/funnel/assets/package.json
@@ -25,6 +25,7 @@
   },
   "dependencies": {
     "hammerjs": "^2.0.8",
+    "hex-rgb": "^4.0.0",
     "jsqr": "^1.1.1",
     "leaflet": "^1.4.0",
     "ractive": "^0.7.3",
diff --git a/funnel/forms/__init__.py b/funnel/forms/__init__.py
index 0070d0301..36a0e5144 100644
--- a/funnel/forms/__init__.py
+++ b/funnel/forms/__init__.py
@@ -9,3 +9,4 @@
 from .session import *
 from .profile import *
 from .participant import *
+from .label import *
diff --git a/funnel/forms/label.py b/funnel/forms/label.py
new file mode 100644
index 000000000..71a574fee
--- /dev/null
+++ b/funnel/forms/label.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+from baseframe import __
+import baseframe.forms as forms
+from .project import valid_color_re
+
+__all__ = ['LabelsetForm', 'LabelForm']
+
+
+class LabelsetForm(forms.Form):
+    title = forms.StringField(__("Name"),
+        description=__("Name of the labelset"),
+        validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
+    description = forms.MarkdownField(__("Description"), description=__("About the labelset"))
+    required = forms.BooleanField(__("Required"), default=False,
+        description=__("When required is set, this labelset must be set for a proposal (e.g. Proposal Type)."))
+    radio_mode = forms.BooleanField(__("Radio mode"), default=False,
+        description=__("When in radio mode, only one label within the labelset can be set at a time (e.g. Proposal Type)."))
+    restricted = forms.BooleanField(__("Restricted"), default=False,
+        description=__("When in restricted mode, only an admin or reviewer can set this labelset for a proposal (e.g. Proposal Status)."))
+
+
+class LabelForm(forms.Form):
+    title = forms.StringField(__("Name"), description=__("Name of the label"),
+        validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
+    bgcolor = forms.StringField(__("Label Color"),
+        validators=[forms.validators.DataRequired(), forms.validators.Length(max=6)],
+        description=__("RGB Color for the label. Enter without the '#'. E.g. CCCCCC."), default=u"CCCCCC")
+    # icon_emoji = forms.StringField(__("Icon/Emoji"),
+    #     validators=[forms.validators.Length(max=2)],
+    #     description=__("Emoji to be used for this label for space constrained UI"))
+
+    def validate_bgcolor(self, field):
+        if not valid_color_re.match(field.data):
+            raise forms.ValidationError("Please enter a valid color code")
diff --git a/funnel/models/label.py b/funnel/models/label.py
index c9cc8ee95..435fb0582 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -2,6 +2,8 @@
 
 from sqlalchemy.ext.orderinglist import ordering_list
 
+from coaster.sqlalchemy import with_roles
+
 from . import db, BaseScopedNameMixin
 from .project import Project
 from .proposal import Proposal
@@ -45,6 +47,31 @@ class Labelset(BaseScopedNameMixin, db.Model):
     def __repr__(self):
         return "<Labelset %s in %s>" % (self.name, self.project.name)
 
+    __roles__ = {
+        'all': {
+            'read': {
+                'name', 'title', 'project_id', 'seq', 'description', 'radio_code',
+                'restricted', 'required'
+            }
+        }
+    }
+
+    def roles_for(self, actor=None, anchors=()):
+        roles = super(Labelset, self).roles_for(actor, anchors)
+        roles.update(self.project.roles_for(actor, anchors))
+        return roles
+
+    @with_roles(call={'admin'})
+    def assign_label(self, label):
+        """
+        This function takes a Label object and links the labelset with it.
+        This function requires role control. Hence this function must be called
+        via ``current_access()``.
+
+        :param label: A Label instance
+        """
+        self.labels.append(label)
+
 
 proposal_label = db.Table(
     'proposal_label', db.Model.metadata,
@@ -61,6 +88,9 @@ class Label(BaseScopedNameMixin, db.Model):
     labelset = db.relationship(Labelset)
     parent = db.synonym('labelset')
 
+    #: Color code to be used in UI with this label
+    bgcolor = db.Column(db.Unicode(6), nullable=False, default=u"CCCCCC")
+
     #: Sequence number for this label, used in UI for ordering
     seq = db.Column(db.Integer, nullable=False)
 
diff --git a/funnel/models/project.py b/funnel/models/project.py
index 988e81f7e..9de8795a0 100644
--- a/funnel/models/project.py
+++ b/funnel/models/project.py
@@ -157,7 +157,7 @@ class Project(UuidMixin, BaseScopedNameMixin, db.Model):
                 '_state', 'website', 'bg_image', 'bg_color', 'explore_url', 'tagline', 'absolute_url',
                 'location'
             },
-        },
+        }
     }
 
     @cached_property
@@ -426,7 +426,8 @@ def permissions(self, user, inherited=None):
                     'view-ticket-type',
                     'edit-participant',
                     'view-participant',
-                    'new-participant'
+                    'new-participant',
+                    'new_labelset'
                 ])
             if self.review_team and user in self.review_team.users:
                 perms.update([
@@ -487,6 +488,17 @@ def roles_for(self, actor=None, anchors=()):
         roles.update(self.profile.roles_for(actor, anchors))
         return roles
 
+    @with_roles(call={'admin'})
+    def assign_labelset(self, labelset):
+        """
+        This function takes a Labelset object and links the project with it.
+        This function requires role control. Hence this function must be called
+        via ``current_access()``.
+
+        :param labelset: A Labelset instance
+        """
+        self.labelsets.append(labelset)
+
 
 Profile.listed_projects = db.relationship(
         Project, lazy='dynamic',
diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 5b0992842..123b0eb30 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -848,18 +848,17 @@ html.touch .collapsible__body--disable {
 
   .proposal-details--left {
     float: left;
+    width: 50%;
   }
 
-  .proposal-video {
-    max-width: 50%;
-  }
-
-  .proposal-details--talk__box {
-    border-right: solid 1px #e3e3e3;
+  .proposal-details--right {
+    float: right;
+    width: 50%;
+    margin-top: 40px;
   }
 
-  .proposal-details--talk__box:last-child {
-    border-right: 0;
+  .proposal-video {
+    max-width: 50%;
   }
 }
 @media (min-width: 1200px) {
@@ -996,6 +995,14 @@ html.touch .collapsible__body--disable {
   margin: 10px 0 0 20px;
 }
 
+.label {
+  padding: 5px 10px;
+  border: 2px solid #F0F2F5;
+  background-color: #F6F8FA;
+  border-radius: 20px;
+  margin-right: 10px;
+}
+
 .proposal-list-header {
   margin: 1px 0 0;
   width: 100%;
diff --git a/funnel/static/sass/_proposal.scss b/funnel/static/sass/_proposal.scss
index e54c610e5..570343575 100644
--- a/funnel/static/sass/_proposal.scss
+++ b/funnel/static/sass/_proposal.scss
@@ -158,18 +158,17 @@
 
   .proposal-details--left {
     float: left;
+    width: 50%;
   }
 
-  .proposal-video {
-    max-width: 50%;
-  }
-
-  .proposal-details--talk__box {
-    border-right: solid 1px #e3e3e3;
+  .proposal-details--right {
+    float: right;
+    width: 50%;
+    margin-top: 40px;
   }
 
-  .proposal-details--talk__box:last-child {
-    border-right: 0;
+  .proposal-video {
+    max-width: 50%;
   }
 }
 
@@ -308,3 +307,11 @@
 .comment--body {
   margin: 10px 0 0 20px;
 }
+
+.label {
+  padding: 5px 10px;
+  border: 2px solid #F0F2F5;
+  background-color: #F6F8FA;
+  border-radius: 20px;
+  margin-right: 10px;
+}
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
new file mode 100644
index 000000000..6adde5b80
--- /dev/null
+++ b/funnel/templates/labels.html.jinja2
@@ -0,0 +1,60 @@
+{% extends "layout.html.jinja2" %}
+{% block title %}{% trans %}Labels{% endtrans %} &ndash; {{ project.title }}{% endblock %}
+
+{% block top_title %}
+  <h1 class="mui--text-display1">{{ project.title|e }}</h1>
+  <p class="mui--text-headline">Manage labels</p>
+{% endblock %}
+
+{% block contentwrapper %}
+  <div class="grid">
+    {%- for labelset in labelsets %}
+      <div class="grid__col-xs-12 grid__col-sm-4">
+        <div class="card">
+          <div class="card__header">
+            <h3>{{ labelset.title }}</h3>
+            <div class="mui--text-body2">{{ labelset.description }}</div>
+          </div>
+          <div class="card__body card__body--lgtext mui--text-subhead">
+            <ol class="mui-list--aligned mui-list--border">
+              {%- for label in labelset.labels %}
+                <li>
+                  <span class="mui--text-subhead"><strong>{{ label.title }}</strong></span>
+                  <span class="mui--pull-right">
+                    <a href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}"><i class="material-icons mui--text-subhead mui--align-top left-margin">edit</i></a>
+                    <a href="{{ label.url_for('delete') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-subhead mui--align-top left-margin">delete</i></a>
+                  </span>
+                </li>
+              {% else %}
+                <li class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></li>
+              {%- endfor %}
+            </ol>
+          </div>
+          <div class="mui-divider"></div>
+          <div class="card__footer">
+            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" href="{{ labelset.url_for('new_label') }}" title="{% trans %}Add label{% endtrans %}">{% trans %}Add label{% endtrans %}</a>
+            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" href="{{ labelset.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit labelset{% endtrans %}</a>
+          </div>
+        </div>
+      </div>
+    {%- endfor %}
+    <div class="grid__col-xs-12 grid__col-sm-4">
+      <div class="clickable-card card" data-href="{{ project.url_for('new_labelset') }}" title="New labelset">
+        <div class="card__image-wrapper">
+          <div class="card__image--default card__image--new">
+            <img class="card__image" src="{{ url_for('static', filename='img/card-background.png') }}" alt="new"/>
+            <p class="card__image__tagline mui--text-display1">+</p>
+          </div>
+        </div>
+        <div class="card__title">
+          <h3 class="mui--text-title card__title__heading mui--text-bold">Create a new labelset</h3>
+<!--           <h4 class="mui--text-caption card__title__heading">Write, collaborate and get feedback.</h4> -->
+        </div>
+        <div class="card__footer">
+          <a href="{{ project.url_for('new_labelset') }}" class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" title="New labelset" data-action="New labelset">Add</a>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %}
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 74825ae49..491a95a4f 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -179,7 +179,7 @@
                 <a href="{{ project.url_for('edit_schedule') }}" title="Edit schedule">{% trans %}Edit schedule{% endtrans %}</a>
               </li>
               <li>
-                <a href="{{ project.url_for('sections') }}" title="Manage sections">{% trans %}Manage sections{% endtrans %}</a>
+                <a href="{{ project.url_for('labelsets') }}" title="Manage labels">{% trans %}Manage labels{% endtrans %}</a>
               </li>
               <li>
                 <a href="{{ project.url_for('venues') }}" title="Manage venues">{% trans %}Manage venues{% endtrans %}</a>
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index bcc81f889..05b09f387 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -86,36 +86,13 @@
             </div>
           {% endif %}
         </div>
-      </div>
-      <div class="proposal-details--talk">
-        <div class="grid">
-          <div class="grid__col-auto proposal-details--talk__box">
-            <p class="mui--text-body2 mui--text-light zero-bottom-margin">Technical level</p>
-            <p class="mui--text-title">{{ proposal.technical_level }}</p>
-          </div>
-          {%- if proposal.section %}
-          <div class="grid__col-auto proposal-details--talk__box mui--text-center">
-            <p class="mui--text-body2 mui--text-light zero-bottom-margin">{% trans %}Section{% endtrans %}</p>
-            <p class="mui--text-title">{{ proposal.section.title }}</p>
-          </div>
-          {%- endif %}
-          {%- if proposal.session_type %}
-          <div class="grid__col-auto proposal-details--talk__box mui--text-center">
-            <p class="mui--text-body2 mui--text-light zero-bottom-margin">{% trans %}Session type{% endtrans %}</p>
-            <p class="mui--text-title">{{ proposal.session_type }}</p>
-          </div>
-          {%- endif %}
-          <div class="grid__col-auto proposal-details--talk__box mui--text-center">
-            <p class="mui--text-body2 mui--text-light zero-bottom-margin">Status</p>
-            {%- if project.current_roles.admin %}
-              <p class="mui--text-title zero-bottom-margin">{{ proposal.state.label.title }}</p>
-            {%- else %}
-              <p class="mui--text-title zero-bottom-margin">{% if proposal.state.CONFIRMED %}{{ proposal.state.label.title }}{% else %}{% trans %}Submitted{% endtrans %}{% endif %}</p>
-            {% endif %}
-            {% if proposal.state.SCHEDULED %}
-              <p class="mui--text-subhead zero-bottom-margin"><a class="" href="{{ proposal.session.url_for() }}">View proposal in schedule</a></p>
-            {% endif %}
-          </div>
+        <div class="proposal-details proposal-details--right">
+          <!-- Example and to be removed -->
+          <span class="label mui--text-bold js-labels" data-bgcolor="#F7e2c5">Beginner</span>
+          <span class="label mui--text-bold js-labels" data-bgcolor="#9feab1">Full talk</span>
+          {%- for label in proposal.labels %}
+          {%- endfor %}
+          <a class="label mui--text-bold mui--text-light">+ Add label</a>
         </div>
       </div>
     </section>
diff --git a/funnel/views/__init__.py b/funnel/views/__init__.py
index 7f5b950e2..0e91fde4c 100644
--- a/funnel/views/__init__.py
+++ b/funnel/views/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from . import index, login, profile, project, section, proposal, commentvote, venue, schedule, session, event, participant
+from . import index, login, profile, project, section, proposal, commentvote, venue, schedule, session, event, participant, label
diff --git a/funnel/views/label.py b/funnel/views/label.py
new file mode 100644
index 000000000..96fb9a28f
--- /dev/null
+++ b/funnel/views/label.py
@@ -0,0 +1,163 @@
+# -*- coding: utf-8 -*-
+
+from flask import flash, redirect, g
+from coaster.views import render_with, requires_permission, route, UrlForView, ModelView
+from baseframe import _
+from baseframe.forms import render_delete_sqla, render_form
+
+from .. import app, funnelapp, lastuser
+from ..models import Labelset, Label, db, Project, Profile
+from ..forms import LabelsetForm, LabelForm
+from .mixins import ProjectViewMixin
+from .decorators import legacy_redirect
+
+
+@route('/<profile>/<project>/labelsets')
+class ProjectLabelsetView(ProjectViewMixin, UrlForView, ModelView):
+    __decorators__ = [legacy_redirect]
+
+    @route('')
+    @render_with('labels.html.jinja2')
+    @lastuser.requires_login
+    @requires_permission('edit_project')
+    def labelsets(self):
+        return dict(project=self.obj, labelsets=self.obj.labelsets)
+
+    @route('new', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @requires_permission('new_labelset')
+    def new_labelset(self):
+        form = LabelsetForm(model=Labelset, parent=self.obj)
+        if form.validate_on_submit():
+            labelset = Labelset(project=self.obj)
+            form.populate_obj(labelset)
+            if 'assign_labelset' in self.obj.current_access():
+                self.obj.current_access().assign_labelset(labelset)
+                db.session.commit()
+                flash(_("The labelset has been successfully created. Assign some labels to it."), 'info')
+                return redirect(self.obj.url_for('labelsets'), code=303)
+            else:
+                flash(_("You don't have permission to create a new labelset for this project"), 'danger')
+                return redirect(self.obj.url_for('labelsets'), code=303)
+        return render_form(form=form, title=_("New labelset"), submit=_("Create labelset"))
+
+
+@route('/<project>/labelsets', subdomain='<profile>')
+class FunnelProjectLabelsetView(ProjectLabelsetView):
+    pass
+
+
+ProjectLabelsetView.init_app(app)
+FunnelProjectLabelsetView.init_app(funnelapp)
+
+
+@route('/<profile>/<project>/labelsets/<labelset>')
+class LabelsetView(UrlForView, ModelView):
+    __decorators__ = [legacy_redirect]
+    model = Labelset
+    route_model_map = {'profile': 'project.profile.name', 'project': 'project.name', 'labelset': 'name'}
+
+    def loader(self, profile, project, labelset):
+        labelset = self.model.query.join(Project).join(Profile).filter(
+            Project.name == project, Profile.name == profile,
+            Labelset.name == labelset
+            ).first_or_404()
+        g.profile = labelset.project.profile
+        return labelset
+
+    @route('edit', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @requires_permission('edit_project')
+    def edit(self):
+        form = LabelsetForm(obj=self.obj, model=Labelset, parent=self.obj.parent)
+        if form.validate_on_submit():
+            form.populate_obj(self.obj)
+            db.session.commit()
+            flash(_("Your labelset has been edited"), 'info')
+            return redirect(self.obj.project.url_for('labelsets'), code=303)
+        return render_form(form=form, title=_("Edit labelset"), submit=_("Save changes"))
+
+    @route('delete', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @requires_permission('edit_project')
+    def delete(self):
+        return render_delete_sqla(self.obj, db, title=_(u"Confirm delete"),
+            message=_(u"Do you really wish to delete labelset '{title}’?").format(title=self.obj.title),
+            success=_("Your labelset has been deleted"),
+            next=self.obj.project.url_for('labelsets'),
+            cancel_url=self.obj.project.url_for('labelsets'))
+
+    @route('new', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @requires_permission('new_labelset')
+    def new_label(self):
+        form = LabelForm(model=Label, parent=self.obj)
+        if form.validate_on_submit():
+            label = Label(labelset=self.obj)
+            form.populate_obj(label)
+            if 'assign_label' in self.obj.current_access():
+                self.obj.current_access().assign_label(label)
+                db.session.commit()
+                flash(_("The label has been successfully created."), 'info')
+                return redirect(self.obj.project.url_for('labelsets'), code=303)
+            else:
+                flash(_("You don't have permission to create a new label for this project"), 'danger')
+                return redirect(self.obj.project.url_for('labelsets'), code=303)
+        return render_form(form=form, title=_("New label for '{}'".format(self.obj.title)), submit=_("Create label"))
+
+
+@route('/<project>/labelset/<labelset>', subdomain='<profile>')
+class FunnelLabelsetView(LabelsetView):
+    pass
+
+
+LabelsetView.init_app(app)
+FunnelLabelsetView.init_app(funnelapp)
+
+
+@route('/<profile>/<project>/labelset/<labelset>/labels/<label>')
+class LabelView(UrlForView, ModelView):
+    __decorators__ = [lastuser.requires_login, legacy_redirect]
+    model = Label
+    route_model_map = {
+        'profile': 'labelset.project.profile.name', 'project': 'labelset.project.name',
+        'labelset': 'labelset.name', 'label': 'name'}
+
+    def loader(self, profile, project, labelset, label):
+        label = self.model.query.join(Labelset.project).filter(
+            Project.name == project,
+            Labelset.name == labelset, Label.name == label
+            ).first_or_404()
+        g.profile = label.labelset.project.profile
+        return label
+
+    @route('edit', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @requires_permission('edit_project')
+    def edit(self):
+        form = LabelForm(obj=self.obj, model=Label, parent=self.obj.parent)
+        if form.validate_on_submit():
+            form.populate_obj(self.obj)
+            db.session.commit()
+            flash(_("Your label has been edited"), 'info')
+            return redirect(self.obj.labelset.project.url_for('labelsets'), code=303)
+        return render_form(form=form, title=_("Edit label"), submit=_("Save changes"))
+
+    @route('delete', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @requires_permission('edit_project')
+    def delete(self):
+        return render_delete_sqla(self.obj, db, title=_(u"Confirm delete"),
+            message=_(u"Do you really wish to delete label '{title}’?").format(title=self.obj.title),
+            success=_("Your label has been deleted"),
+            next=self.obj.labelset.project.url_for('labelsets'),
+            cancel_url=self.obj.labelset.project.url_for('labelsets'))
+
+
+@route('/<project>/labelset/<label>', subdomain='<profile>')
+class FunnelLabelView(LabelView):
+    pass
+
+
+LabelView.init_app(app)
+FunnelLabelView.init_app(funnelapp)
diff --git a/migrations/versions/0b25df40d307_add_labels_and_labelsets.py b/migrations/versions/0b25df40d307_add_labels_and_labelsets.py
index b44329af4..9ea4f0639 100644
--- a/migrations/versions/0b25df40d307_add_labels_and_labelsets.py
+++ b/migrations/versions/0b25df40d307_add_labels_and_labelsets.py
@@ -27,7 +27,7 @@ def upgrade():
         sa.Column('name', sa.Unicode(length=250), nullable=False),
         sa.Column('title', sa.Unicode(length=250), nullable=False),
         sa.Column('id', sa.Integer(), nullable=False),
-        sa.ForeignKeyConstraint(['project_id'], ['profile.id'], ondelete='CASCADE'),
+        sa.ForeignKeyConstraint(['project_id'], ['project.id'], ondelete='CASCADE'),
         sa.PrimaryKeyConstraint('id'),
         sa.UniqueConstraint('project_id', 'name')
     )
@@ -36,6 +36,7 @@ def upgrade():
         sa.Column('updated_at', sa.DateTime(), nullable=False),
         sa.Column('labelset_id', sa.Integer(), nullable=False),
         sa.Column('seq', sa.Integer(), nullable=False),
+        sa.Column('bgcolor', sa.Unicode(length=6), nullable=False),
         sa.Column('icon_emoji', sa.Unicode(length=1), nullable=True),
         sa.Column('name', sa.Unicode(length=250), nullable=False),
         sa.Column('title', sa.Unicode(length=250), nullable=False),

From 909fa4ef575c50e1b02ca943bf1dc6087bbce817 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Thu, 11 Apr 2019 17:02:41 +0530
Subject: [PATCH 011/125] added migration for moving old sections, session
 types and technical level to labelsets

---
 .../f89e3a85ed10_migrate_old_labels.py        | 157 ++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 migrations/versions/f89e3a85ed10_migrate_old_labels.py

diff --git a/migrations/versions/f89e3a85ed10_migrate_old_labels.py b/migrations/versions/f89e3a85ed10_migrate_old_labels.py
new file mode 100644
index 000000000..c11b13363
--- /dev/null
+++ b/migrations/versions/f89e3a85ed10_migrate_old_labels.py
@@ -0,0 +1,157 @@
+"""migrate old labels
+
+Revision ID: f89e3a85ed10
+Revises: 0b25df40d307
+Create Date: 2019-04-11 14:42:55.182622
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'f89e3a85ed10'
+down_revision = '0b25df40d307'
+
+from datetime import datetime
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.sql import table, column
+
+
+proposal = table('proposal',
+    column('id', sa.Integer()),
+    column('project_id', sa.Integer()),
+    column('technical_level', sa.Unicode(40)),
+    column('session_type', sa.Unicode(40)),
+    column('section_id', sa.Integer()),
+    )
+
+project = table('project',
+    column('id', sa.Integer()),
+    column('name', sa.Unicode(250))
+    )
+
+section = table('section',
+    column('id', sa.Integer()),
+    column('project_id', sa.Integer()),
+    column('name', sa.Unicode(250)),
+    column('title', sa.Unicode(250)),
+    column('description', sa.UnicodeText()),
+    column('created_at', sa.DateTime()),
+    column('updated_at', sa.DateTime())
+    )
+
+labelset = table('labelset',
+    column('id', sa.Integer()),
+    column('name', sa.Unicode(250)),
+    column('title', sa.Unicode(250)),
+    column('project_id', sa.Integer()),
+    column('seq', sa.Integer()),
+    column('description', sa.UnicodeText()),
+    column('radio_mode', sa.Boolean()),
+    column('restricted', sa.Boolean()),
+    column('required', sa.Boolean()),
+    column('created_at', sa.DateTime()),
+    column('updated_at', sa.DateTime())
+    )
+
+label = table('label',
+    column('id', sa.Integer()),
+    column('name', sa.Unicode(250)),
+    column('title', sa.Unicode(250)),
+    column('bgcolor', sa.Unicode(6)),
+    column('labelset_id', sa.Integer()),
+    column('seq', sa.Integer()),
+    column('created_at', sa.DateTime()),
+    column('updated_at', sa.DateTime())
+    )
+
+proposal_label = table('proposal_label',
+    column('proposal_id', sa.Integer()),
+    column('label_id', sa.Integer()),
+    column('created_at', sa.DateTime())
+    )
+
+
+def upgrade():
+    conn = op.get_bind()
+    # Migrate sections -
+    projects = conn.execute(project.select())
+    for proj in projects:
+        sec_count = conn.scalar(
+                sa.select([sa.func.count('*')]).select_from(section).where(section.c.project_id == proj['id'])
+            )
+        if sec_count > 0:
+            # the project has some sections
+            # create section labelset for the project
+            labset = conn.execute(labelset.insert().values({
+                    'project_id': proj['id'], 'name': u"section", 'title': u"Section",
+                    'seq': 1, 'description': "", 'radio_mode': True, 'restricted': True,
+                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+                }).returning(labelset.c.id)).first()
+
+            sections = conn.execute(section.select().where(section.c.project_id == proj['id']))
+            for index, sec in enumerate(sections, start=1):
+                lab = conn.execute(label.insert().values({
+                    'name': sec['name'], 'title': sec['title'],
+                    'labelset_id': labset[0], 'seq': index, 'bgcolor': u"CCCCCC",
+                    'created_at': datetime.now(), 'updated_at': datetime.now()
+                }).returning(label.c.id, label.c.name)).first()
+
+                proposals = conn.execute(
+                        proposal.select().where(proposal.c.section_id == sec['id']).where(proposal.c.project_id == sec['project_id'])
+                    )
+                for prop in proposals:
+                    pl = conn.execute(proposal_label.insert().values({
+                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
+                    }))
+
+        # technical level
+        labset = conn.execute(labelset.insert().values({
+            'project_id': proj['id'], 'name': u"technical-level", 'title': u"Technical Level",
+            'seq': 1, 'description': "", 'radio_mode': True, 'restricted': True,
+            'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+        }).returning(labelset.c.id)).first()
+        tl_list = [('beginner', "Beginner"), ('intermediate', "Intermediate"), ('advanced', "Advanced")]
+        for index, tl in enumerate(tl_list):
+            tl_name, tl_title = tl
+            lab = conn.execute(label.insert().values({
+                    'name': tl_name, 'title': tl_title,
+                    'labelset_id': labset[0], 'seq': index, 'bgcolor': u"CCCCCC",
+                    'created_at': datetime.now(), 'updated_at': datetime.now()
+                }).returning(label.c.id, label.c.name)).first()
+
+            proposals = conn.execute(
+                    proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.technical_level == tl_title)
+                )
+            for prop in proposals:
+                pl = conn.execute(proposal_label.insert().values({
+                    'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
+                }))
+
+        # session type
+        labset = conn.execute(labelset.insert().values({
+                'project_id': proj['id'], 'name': u"session-type", 'title': u"Session Type",
+                'seq': 1, 'description': "", 'radio_mode': True, 'restricted': True,
+                'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+            }).returning(labelset.c.id)).first()
+        st_list = [('lecture', "Lecture"), ('demo', "Demo"), ('tutorial', "Tutorial"), ('workshop', "Workshop"), ('discussion', "Discussion"), ('panel', "Panel")]
+        for index, st in enumerate(st_list):
+            st_name, st_title = st
+            lab = conn.execute(label.insert().values({
+                    'name': st_name, 'title': st_title,
+                    'labelset_id': labset[0], 'seq': index, 'bgcolor': u"CCCCCC",
+                    'created_at': datetime.now(), 'updated_at': datetime.now()
+                }).returning(label.c.id, label.c.name)).first()
+
+            proposals = conn.execute(
+                    proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.session_type == st_title)
+                )
+            for prop in proposals:
+                conn.execute(proposal_label.insert().values({
+                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
+                    }))
+
+def downgrade():
+    conn = op.get_bind()
+    conn.execute(labelset.delete())
+    conn.execute(label.delete())
+    conn.execute(proposal_label.delete())

From 3e0c426cec49619a72e3ac4d3b4edaf844cb3e03 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Thu, 11 Apr 2019 17:04:38 +0530
Subject: [PATCH 012/125] some comments

---
 migrations/versions/f89e3a85ed10_migrate_old_labels.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/migrations/versions/f89e3a85ed10_migrate_old_labels.py b/migrations/versions/f89e3a85ed10_migrate_old_labels.py
index c11b13363..ea916f02c 100644
--- a/migrations/versions/f89e3a85ed10_migrate_old_labels.py
+++ b/migrations/versions/f89e3a85ed10_migrate_old_labels.py
@@ -88,6 +88,7 @@ def upgrade():
                     'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
                 }).returning(labelset.c.id)).first()
 
+            # add old sections as labels to the above labelset
             sections = conn.execute(section.select().where(section.c.project_id == proj['id']))
             for index, sec in enumerate(sections, start=1):
                 lab = conn.execute(label.insert().values({
@@ -96,6 +97,10 @@ def upgrade():
                     'created_at': datetime.now(), 'updated_at': datetime.now()
                 }).returning(label.c.id, label.c.name)).first()
 
+                # only select proposals that belonged to above section and
+                # still in the same project as the section. This removed proposals
+                # that were moved to other projects but their section relationship
+                # was never migrated.
                 proposals = conn.execute(
                         proposal.select().where(proposal.c.section_id == sec['id']).where(proposal.c.project_id == sec['project_id'])
                     )

From 8c74b4a37415bd523cac0a41ab7fe5b5918cb660 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 12 Apr 2019 10:40:01 +0530
Subject: [PATCH 013/125] added dynamic proposalform and handling of labels

---
 funnel/forms/proposal.py                      | 71 ++++++++++++++-----
 funnel/models/label.py                        | 13 ++++
 funnel/models/proposal.py                     |  2 +-
 funnel/templates/proposal.html.jinja2         |  3 +-
 funnel/views/proposal.py                      | 20 +-----
 .../f89e3a85ed10_migrate_old_labels.py        |  1 +
 6 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 56dd9a859..16c33e7cd 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -4,7 +4,7 @@
 import baseframe.forms as forms
 from flask import g
 from baseframe.forms.sqlalchemy import QuerySelectField
-from ..models import Project, Profile, Proposal
+from ..models import Project, Profile, Proposal, Label, Labelset
 
 __all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm', 'ProposalMoveForm']
 
@@ -13,29 +13,14 @@ class TransferProposal(forms.Form):
     userid = forms.UserSelectField(__("Transfer to"), validators=[forms.validators.DataRequired()])
 
 
-class ProposalForm(forms.Form):
+class _ProposalFormInner(forms.Form):
     speaking = forms.RadioField(__("Are you speaking?"), coerce=int,
         choices=[(1, __(u"I will be speaking")),
                  (0, __(u"I’m proposing a topic for someone to speak on"))])
     title = forms.StringField(__("Title"), validators=[forms.validators.DataRequired()],
         description=__("The title of your session"))
-    section = QuerySelectField(__("Section"), get_label='title', validators=[forms.validators.DataRequired()],
-        widget=forms.ListWidget(prefix_label=False), option_widget=forms.RadioInput())
     objective = forms.MarkdownField(__("Objective"), validators=[forms.validators.DataRequired()],
         description=__("What is the expected benefit for someone attending this?"))
-    session_type = forms.RadioField(__("Session type"), validators=[forms.validators.DataRequired()], choices=[
-        ('Lecture', __("Lecture")),
-        ('Demo', __("Demo")),
-        ('Tutorial', __("Tutorial")),
-        ('Workshop', __("Workshop")),
-        ('Discussion', __("Discussion")),
-        ('Panel', __("Panel")),
-        ])
-    technical_level = forms.RadioField(__("Technical level"), validators=[forms.validators.DataRequired()], choices=[
-        ('Beginner', __("Beginner")),
-        ('Intermediate', __("Intermediate")),
-        ('Advanced', __("Advanced")),
-        ])
     description = forms.MarkdownField(__("Description"), validators=[forms.validators.DataRequired()],
         description=__("A detailed description of the session"))
     requirements = forms.MarkdownField(__("Requirements"),
@@ -64,7 +49,7 @@ class ProposalForm(forms.Form):
         description=__("Your location, to help plan for your travel if required"))
 
     def __init__(self, *args, **kwargs):
-        super(ProposalForm, self).__init__(*args, **kwargs)
+        super(_ProposalFormInner, self).__init__(*args, **kwargs)
         project = kwargs.get('parent')
         if project.proposal_part_a.get('title'):
             self.objective.label.text = project.proposal_part_a.get('title')
@@ -75,6 +60,56 @@ def __init__(self, *args, **kwargs):
         if project.proposal_part_b.get('hint'):
             self.description.description = project.proposal_part_b.get('hint')
 
+    def set_queries(self):
+        for labelset in self.edit_parent.labelsets:
+            labels_data = set(self.edit_obj.labels).intersection(set(labelset.labels))
+            data = labels_data.pop().name if len(labels_data) == 1 else [l.name for l in labels_data]
+            labelset_field = getattr(self, labelset.form_name)
+            if labelset_field.data == 'None' and data:
+                labelset_field.data = data
+
+    def populate_obj_labels(self, proposal):
+        for key in self.data.keys():
+            if key.startswith('labelset_'):
+                labelset = Labelset.query.filter_by(form_name=key, project=proposal.project).first()
+                # in case of MultiSelectField, self.data.get(key) is a list
+                label_names = self.data.get(key) if isinstance(self.data.get(key), list) else [self.data.get(key)]
+                if labelset.radio_mode:
+                    for lname in label_names:
+                        label = Label.query.filter_by(labelset=labelset, name=lname).first()
+                        proposal.assign_label(label)
+                else:
+                    existing_labels = set(labelset.labels).intersection(set(proposal.labels))
+                    for elabel in existing_labels:
+                        proposal.labels.remove(elabel)
+                    for lname in label_names:
+                        label = Label.query.filter_by(labelset=labelset, name=lname).first()
+                        proposal.assign_label(label)
+
+
+class ProposalForm(object):
+    def __new__(self, *args, **kwargs):
+        proposal_form = _ProposalFormInner
+
+        if 'parent' in kwargs:
+            # we need parent project to be able to handle labelsets
+            project = kwargs.get('parent')
+            for labelset in project.labelsets:
+                ls_name = labelset.form_name
+                if not hasattr(self, ls_name):
+                    if labelset.restricted and not set(project.current_roles).intersection({'admin', 'reviewer'}):
+                        continue
+                    FieldType = forms.RadioField if labelset.radio_mode else forms.SelectMultipleField
+                    validators = [forms.validators.DataRequired()] if labelset.required else []
+                    if 'obj' in kwargs:
+                        # Edit form
+                        choices = [(l.name, l.title) for l in labelset.labels]
+                    setattr(proposal_form, ls_name, FieldType(labelset.title, validators=validators,
+                        choices=choices, description=labelset.description))
+
+        return _ProposalFormInner(*args, **kwargs)
+
+
 
 class ProposalTransitionForm(forms.Form):
     transition = forms.SelectField(__("Status"), validators=[forms.validators.DataRequired()])
diff --git a/funnel/models/label.py b/funnel/models/label.py
index 435fb0582..58ac4fde0 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from sqlalchemy import func
 from sqlalchemy.ext.orderinglist import ordering_list
+from sqlalchemy.ext.hybrid import hybrid_property
 
 from coaster.sqlalchemy import with_roles
 
@@ -56,6 +58,17 @@ def __repr__(self):
         }
     }
 
+    @hybrid_property
+    def form_name(self):
+        """
+        Generates a name to be used in forms when a field is created for this labelset
+        """
+        return 'labelset_' + self.name.replace('-', '_')
+
+    @form_name.expression
+    def form_name(cls):
+        return func.concat('labelset_', func.replace(cls.name, '-', '_'))
+
     def roles_for(self, actor=None, anchors=()):
         roles = super(Labelset, self).roles_for(actor, anchors)
         roles.update(self.project.roles_for(actor, anchors))
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 65d151aa5..02809fca4 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -333,7 +333,7 @@ def permissions(self, user, inherited=None):
             perms.update([
                 'vote_proposal',
                 'new_comment',
-                'vote_comment',
+                'vote_comment'
                 ])
             if user == self.owner:
                 perms.update([
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 05b09f387..23b8dd17d 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -88,9 +88,8 @@
         </div>
         <div class="proposal-details proposal-details--right">
           <!-- Example and to be removed -->
-          <span class="label mui--text-bold js-labels" data-bgcolor="#F7e2c5">Beginner</span>
-          <span class="label mui--text-bold js-labels" data-bgcolor="#9feab1">Full talk</span>
           {%- for label in proposal.labels %}
+            <span class="label mui--text-bold js-labels" data-bgcolor="#{{ label.bgcolor }}">{{ label.labelset.title }}: {{ label.title }}</span>
           {%- endfor %}
           <a class="label mui--text-bold mui--text-light">+ Add label</a>
         </div>
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index bec793aa3..2ac3b5373 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -12,7 +12,7 @@
 from baseframe.forms import render_form, render_delete_sqla, Form
 
 from .. import app, funnelapp, lastuser
-from ..models import db, Section, Proposal, Comment
+from ..models import db, Section, Proposal, Comment, Label, Labelset
 from ..forms import ProposalForm, CommentForm, DeleteCommentForm, ProposalTransitionForm, ProposalMoveForm
 from .mixins import ProjectViewMixin, ProposalViewMixin
 from .decorators import legacy_redirect
@@ -94,14 +94,6 @@ class BaseProjectProposalView(ProjectViewMixin, UrlChangeCheck, UrlForView, Mode
     @requires_permission('new-proposal')
     def new_proposal(self):
         form = ProposalForm(model=Proposal, parent=self.obj)
-        del form.session_type  # We don't use this anymore
-        if self.obj.inherit_sections:
-            form.section.query = Section.query.filter(or_(Section.project == self.obj, Section.project == self.obj.parent_project), Section.public == True).order_by('title')  # NOQA
-        else:
-            form.section.query = Section.query.filter(Section.project == self.obj, Section.public == True).order_by('title')  # NOQA
-        if len(list(form.section.query.all())) == 0:
-            # Don't bother with sections when there aren't any
-            del form.section
         if request.method == 'GET':
             form.email.data = g.user.email
             form.phone.data = g.user.phone
@@ -176,19 +168,11 @@ def json(self):
     @requires_permission('edit-proposal')
     def edit(self):
         form = ProposalForm(obj=self.obj.formdata, model=Proposal, parent=self.obj.project)
-        if not self.obj.session_type:
-            del form.session_type  # Remove this if we're editing a proposal that had no session type
-        if self.obj.project.inherit_sections:
-            form.section.query = Section.query.filter(or_(Section.project == self.obj.project, Section.project == self.obj.project.parent_project), Section.public == True).order_by('title')  # NOQA
-        else:
-            form.section.query = Section.query.filter(Section.project == self.obj.project, Section.public == True).order_by('title')  # NOQA
-        if len(list(form.section.query.all())) == 0:
-            # Don't bother with sections when there aren't any
-            del form.section
         if self.obj.user != g.user:
             del form.speaking
         if form.validate_on_submit():
             form.populate_obj(self.obj.formdata)
+            form.populate_obj_labels(self.obj)
             self.obj.name = make_name(self.obj.title)
             self.obj.edited_at = datetime.utcnow()
             db.session.commit()
diff --git a/migrations/versions/f89e3a85ed10_migrate_old_labels.py b/migrations/versions/f89e3a85ed10_migrate_old_labels.py
index ea916f02c..b0b0a4a9d 100644
--- a/migrations/versions/f89e3a85ed10_migrate_old_labels.py
+++ b/migrations/versions/f89e3a85ed10_migrate_old_labels.py
@@ -155,6 +155,7 @@ def upgrade():
                         'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
                     }))
 
+
 def downgrade():
     conn = op.get_bind()
     conn.execute(labelset.delete())

From ef7ee3af5208b7f70efe4cc54cd5a8aa37a3d611 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 12 Apr 2019 10:45:11 +0530
Subject: [PATCH 014/125] added comments

---
 funnel/forms/proposal.py  | 10 +++++++++-
 funnel/models/proposal.py |  3 +++
 funnel/views/proposal.py  |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 16c33e7cd..ba1be903b 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -69,6 +69,9 @@ def set_queries(self):
                 labelset_field.data = data
 
     def populate_obj_labels(self, proposal):
+        """
+        Assign the appropriate labels to the proposal
+        """
         for key in self.data.keys():
             if key.startswith('labelset_'):
                 labelset = Labelset.query.filter_by(form_name=key, project=proposal.project).first()
@@ -89,6 +92,12 @@ def populate_obj_labels(self, proposal):
 
 class ProposalForm(object):
     def __new__(self, *args, **kwargs):
+        """
+        Proxy object that intercepts ProposalForm initiation and adds the
+        dynamic fields for the labelsets to the form. The dynamic fields
+        need to be added to the Form class, hence this. This way the regular
+        way of using ProposalForm doesn't change.
+        """
         proposal_form = _ProposalFormInner
 
         if 'parent' in kwargs:
@@ -110,7 +119,6 @@ def __new__(self, *args, **kwargs):
         return _ProposalFormInner(*args, **kwargs)
 
 
-
 class ProposalTransitionForm(forms.Form):
     transition = forms.SelectField(__("Status"), validators=[forms.validators.DataRequired()])
 
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 02809fca4..7f5d974f7 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -372,6 +372,9 @@ def assign_label(self, label):
                 # remove the older label and assign given label.
                 existing_label = existing_labels.pop()
                 self.labels.remove(existing_label)
+
+        # FIXME: Remove labels that have been removed using the proposal form
+
         # labelset is not in radio mode, so we can assign label to proposal
         self.labels.append(label)
 
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index 2ac3b5373..02fc568a6 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -172,7 +172,7 @@ def edit(self):
             del form.speaking
         if form.validate_on_submit():
             form.populate_obj(self.obj.formdata)
-            form.populate_obj_labels(self.obj)
+            form.populate_obj_labels(self.obj)  # this is needed to assign the labels
             self.obj.name = make_name(self.obj.title)
             self.obj.edited_at = datetime.utcnow()
             db.session.commit()

From e755ef3e7060f787f5ba6b1da4e2bf2853de48fd Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 12 Apr 2019 10:58:34 +0530
Subject: [PATCH 015/125] added removal of labels in non radio mode

---
 funnel/forms/proposal.py  | 19 ++++++++++---------
 funnel/models/proposal.py |  5 +----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index ba1be903b..40f14841d 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -75,19 +75,20 @@ def populate_obj_labels(self, proposal):
         for key in self.data.keys():
             if key.startswith('labelset_'):
                 labelset = Labelset.query.filter_by(form_name=key, project=proposal.project).first()
+                existing_labels = set(labelset.labels).intersection(set(proposal.labels))
                 # in case of MultiSelectField, self.data.get(key) is a list
                 label_names = self.data.get(key) if isinstance(self.data.get(key), list) else [self.data.get(key)]
+                new_labels = [Label.query.filter_by(labelset=labelset, name=lname).first() for lname in label_names]
                 if labelset.radio_mode:
-                    for lname in label_names:
-                        label = Label.query.filter_by(labelset=labelset, name=lname).first()
-                        proposal.assign_label(label)
+                    for nlabel in new_labels:
+                        proposal.assign_label(nlabel)
                 else:
-                    existing_labels = set(labelset.labels).intersection(set(proposal.labels))
-                    for elabel in existing_labels:
-                        proposal.labels.remove(elabel)
-                    for lname in label_names:
-                        label = Label.query.filter_by(labelset=labelset, name=lname).first()
-                        proposal.assign_label(label)
+                    # FIXME: Move this part inside model?
+                    removed_labels = existing_labels.difference(set(new_labels))
+                    for rlabel in removed_labels:
+                        proposal.labels.remove(rlabel)
+                    for nlabel in new_labels:
+                        proposal.assign_label(nlabel)
 
 
 class ProposalForm(object):
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 7f5d974f7..65d151aa5 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -333,7 +333,7 @@ def permissions(self, user, inherited=None):
             perms.update([
                 'vote_proposal',
                 'new_comment',
-                'vote_comment'
+                'vote_comment',
                 ])
             if user == self.owner:
                 perms.update([
@@ -372,9 +372,6 @@ def assign_label(self, label):
                 # remove the older label and assign given label.
                 existing_label = existing_labels.pop()
                 self.labels.remove(existing_label)
-
-        # FIXME: Remove labels that have been removed using the proposal form
-
         # labelset is not in radio mode, so we can assign label to proposal
         self.labels.append(label)
 

From 3400a3ed638babcea58d6fc05370053b205733a9 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 12 Apr 2019 11:50:07 +0530
Subject: [PATCH 016/125] Add CTA button to proposal page

---
 funnel/static/css/app.css             |  9 +++++++++
 funnel/static/sass/_layout.scss       |  9 +++++++++
 funnel/templates/proposal.html.jinja2 | 12 ++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 123b0eb30..488475473 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -231,6 +231,15 @@ html.touch .collapsible__body--disable {
   margin-top: -30px;
 }
 
+.mui-btn--nopadding {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.mui-btn--nopadding:hover {
+  background: transparent !important;
+}
+
 .header__site-title__item {
   font-size: 18px;
   line-height: 28px;
diff --git a/funnel/static/sass/_layout.scss b/funnel/static/sass/_layout.scss
index 60e16a26e..5d58a8baa 100644
--- a/funnel/static/sass/_layout.scss
+++ b/funnel/static/sass/_layout.scss
@@ -238,3 +238,12 @@ html.touch .collapsible__body--disable {
   font-size: 24px;
   margin-top: -30px;
 }
+
+.mui-btn--nopadding {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.mui-btn--nopadding:hover {
+  background: transparent !important;
+}
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 05b09f387..1a4b57d45 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -21,6 +21,18 @@
 {% block top_title %}
   <h1 class="mui--text-display1"><strong>{{ project.title|e }}</strong></h1>
   <p class="mui--text-headline">{{ project.tagline|safe }}</p>
+  <p>
+  {%- if project.boxoffice_data and project.boxoffice_data.item_collection_id -%}
+    <a class="mui-btn mui-btn--small mui-btn--primary mui--d-inlineblock" href="{{ project.url_for() }}#participate" title="Participate" data-action="Participate(header-proposalpage)">Participate</a>
+  {%- elif project.buy_tickets_url.url %}
+    <a class="mui-btn mui-btn--small mui-btn--primary mui--d-inlineblock" href="{{ project.buy_tickets_url }}" title="Participate" data-action="Participate(header-proposalpage)">Participate</a>
+  {%- elif project.allow_rsvp %}
+    <a class="mui-btn mui-btn--small mui-btn--primary mui--d-inlineblock" href="{{ project.url_for() }}#participate" title="Participate" data-action="Participate(header-proposalpage)">Participate</a>
+  {%- endif %}
+  {% if project.cfp_state.PUBLIC -%}
+    <a class="mui-btn mui-btn--flat mui-btn--nopadding" href="{{ project.url_for('new_proposal') }}" title="Propose a session" data-action="Propose a session(header)"><i class="material-icons mui--text-subhead mui--align-middle">mic</i>{% trans %}Propose a session{% endtrans %}</a>
+  {% endif %}
+  </p>
 {% endblock %}
 
 {% block contentwrapper %}

From 040509cc51292b329441878bd082d0a4d5004168 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 12 Apr 2019 12:00:23 +0530
Subject: [PATCH 017/125] Fix styling of proposal labels

---
 funnel/static/css/app.css             | 3 ++-
 funnel/static/sass/_proposal.scss     | 3 ++-
 funnel/templates/proposal.html.jinja2 | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 488475473..cd166cd35 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -1009,7 +1009,8 @@ html.touch .collapsible__body--disable {
   border: 2px solid #F0F2F5;
   background-color: #F6F8FA;
   border-radius: 20px;
-  margin-right: 10px;
+  display: inline-block;
+  margin: 0 10px 10px 0;
 }
 
 .proposal-list-header {
diff --git a/funnel/static/sass/_proposal.scss b/funnel/static/sass/_proposal.scss
index 570343575..501eba08e 100644
--- a/funnel/static/sass/_proposal.scss
+++ b/funnel/static/sass/_proposal.scss
@@ -313,5 +313,6 @@
   border: 2px solid #F0F2F5;
   background-color: #F6F8FA;
   border-radius: 20px;
-  margin-right: 10px;
+  display: inline-block;
+  margin: 0 10px 10px 0;
 }
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 4cad9ed19..84920046a 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -99,7 +99,6 @@
           {% endif %}
         </div>
         <div class="proposal-details proposal-details--right">
-          <!-- Example and to be removed -->
           {%- for label in proposal.labels %}
             <span class="label mui--text-bold js-labels" data-bgcolor="#{{ label.bgcolor }}">{{ label.labelset.title }}: {{ label.title }}</span>
           {%- endfor %}

From e979deede983f56a5da44c5115b0331e283a48ec Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 12 Apr 2019 12:01:56 +0530
Subject: [PATCH 018/125] removed the inner outer form classes, added
 get_proposal_form

---
 funnel/forms/proposal.py | 56 +++++++++++++++++++---------------------
 funnel/views/proposal.py |  7 ++---
 2 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 40f14841d..8fa405e11 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -6,14 +6,14 @@
 from baseframe.forms.sqlalchemy import QuerySelectField
 from ..models import Project, Profile, Proposal, Label, Labelset
 
-__all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm', 'ProposalMoveForm']
+__all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm', 'ProposalMoveForm', 'get_proposal_form']
 
 
 class TransferProposal(forms.Form):
     userid = forms.UserSelectField(__("Transfer to"), validators=[forms.validators.DataRequired()])
 
 
-class _ProposalFormInner(forms.Form):
+class ProposalForm(forms.Form):
     speaking = forms.RadioField(__("Are you speaking?"), coerce=int,
         choices=[(1, __(u"I will be speaking")),
                  (0, __(u"I’m proposing a topic for someone to speak on"))])
@@ -49,7 +49,7 @@ class _ProposalFormInner(forms.Form):
         description=__("Your location, to help plan for your travel if required"))
 
     def __init__(self, *args, **kwargs):
-        super(_ProposalFormInner, self).__init__(*args, **kwargs)
+        super(ProposalForm, self).__init__(*args, **kwargs)
         project = kwargs.get('parent')
         if project.proposal_part_a.get('title'):
             self.objective.label.text = project.proposal_part_a.get('title')
@@ -91,33 +91,29 @@ def populate_obj_labels(self, proposal):
                         proposal.assign_label(nlabel)
 
 
-class ProposalForm(object):
-    def __new__(self, *args, **kwargs):
-        """
-        Proxy object that intercepts ProposalForm initiation and adds the
-        dynamic fields for the labelsets to the form. The dynamic fields
-        need to be added to the Form class, hence this. This way the regular
-        way of using ProposalForm doesn't change.
-        """
-        proposal_form = _ProposalFormInner
-
-        if 'parent' in kwargs:
-            # we need parent project to be able to handle labelsets
-            project = kwargs.get('parent')
-            for labelset in project.labelsets:
-                ls_name = labelset.form_name
-                if not hasattr(self, ls_name):
-                    if labelset.restricted and not set(project.current_roles).intersection({'admin', 'reviewer'}):
-                        continue
-                    FieldType = forms.RadioField if labelset.radio_mode else forms.SelectMultipleField
-                    validators = [forms.validators.DataRequired()] if labelset.required else []
-                    if 'obj' in kwargs:
-                        # Edit form
-                        choices = [(l.name, l.title) for l in labelset.labels]
-                    setattr(proposal_form, ls_name, FieldType(labelset.title, validators=validators,
-                        choices=choices, description=labelset.description))
-
-        return _ProposalFormInner(*args, **kwargs)
+def get_proposal_form(base_form_class, *args, **kwargs):
+    """
+    Takes a proposal form class as base form and adds the labelset fields to it.
+    Dynamic fields can only be added to the form class and not instance. Hence this.
+    Any form that has `obj=<proposal_object>` passed to it, can be used with this function.
+    `parent` kwarg must be provided, otherwise the labelsets wont be added to the form.
+    """
+    if 'parent' in kwargs:
+        # we need parent project to be able to handle labelsets
+        project = kwargs.get('parent')
+        for labelset in project.labelsets:
+            ls_name = labelset.form_name
+            if not hasattr(base_form_class, ls_name):
+                if labelset.restricted and not set(project.current_roles).intersection({'admin', 'reviewer'}):
+                    continue
+                FieldType = forms.RadioField if labelset.radio_mode else forms.SelectMultipleField
+                validators = [forms.validators.DataRequired()] if labelset.required else []
+                if 'obj' in kwargs:
+                    # Edit form
+                    choices = [(l.name, l.title) for l in labelset.labels]
+                setattr(base_form_class, ls_name, FieldType(labelset.title, validators=validators,
+                    choices=choices, description=labelset.description))
+    return base_form_class(*args, **kwargs)
 
 
 class ProposalTransitionForm(forms.Form):
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index 02fc568a6..404053909 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -13,7 +13,8 @@
 
 from .. import app, funnelapp, lastuser
 from ..models import db, Section, Proposal, Comment, Label, Labelset
-from ..forms import ProposalForm, CommentForm, DeleteCommentForm, ProposalTransitionForm, ProposalMoveForm
+from ..forms import (ProposalForm, CommentForm, DeleteCommentForm,
+    ProposalTransitionForm, ProposalMoveForm, get_proposal_form)
 from .mixins import ProjectViewMixin, ProposalViewMixin
 from .decorators import legacy_redirect
 
@@ -93,7 +94,7 @@ class BaseProjectProposalView(ProjectViewMixin, UrlChangeCheck, UrlForView, Mode
     @lastuser.requires_login
     @requires_permission('new-proposal')
     def new_proposal(self):
-        form = ProposalForm(model=Proposal, parent=self.obj)
+        form = get_proposal_form(ProposalForm, model=Proposal, parent=self.obj)
         if request.method == 'GET':
             form.email.data = g.user.email
             form.phone.data = g.user.phone
@@ -167,7 +168,7 @@ def json(self):
     @lastuser.requires_login
     @requires_permission('edit-proposal')
     def edit(self):
-        form = ProposalForm(obj=self.obj.formdata, model=Proposal, parent=self.obj.project)
+        form = get_proposal_form(ProposalForm, obj=self.obj.formdata, model=Proposal, parent=self.obj.project)
         if self.obj.user != g.user:
             del form.speaking
         if form.validate_on_submit():

From 9f9c8e94ce7c95457fb8bdb1cb172cee69c6f78c Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 12 Apr 2019 18:00:12 +0530
Subject: [PATCH 019/125] added archived flag

---
 funnel/forms/label.py                             |  5 +++++
 funnel/models/label.py                            |  8 ++++++++
 .../0b25df40d307_add_labels_and_labelsets.py      |  2 ++
 .../versions/f89e3a85ed10_migrate_old_labels.py   | 15 +++++++++------
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 71a574fee..c200a10a7 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -18,6 +18,8 @@ class LabelsetForm(forms.Form):
         description=__("When in radio mode, only one label within the labelset can be set at a time (e.g. Proposal Type)."))
     restricted = forms.BooleanField(__("Restricted"), default=False,
         description=__("When in restricted mode, only an admin or reviewer can set this labelset for a proposal (e.g. Proposal Status)."))
+    archived = forms.BooleanField(__("Archived"), default=False,
+        description=__("Once archived, this labelset will not be available for use in future, but the past records will be preserved."))
 
 
 class LabelForm(forms.Form):
@@ -26,6 +28,9 @@ class LabelForm(forms.Form):
     bgcolor = forms.StringField(__("Label Color"),
         validators=[forms.validators.DataRequired(), forms.validators.Length(max=6)],
         description=__("RGB Color for the label. Enter without the '#'. E.g. CCCCCC."), default=u"CCCCCC")
+    archived = forms.BooleanField(__("Archived"), default=False,
+        description=__("Once archived, this label will not be available for use in future, but the past records will be preserved."))
+    # We're not going to use icon_emoji until we move to Py3
     # icon_emoji = forms.StringField(__("Icon/Emoji"),
     #     validators=[forms.validators.Length(max=2)],
     #     description=__("Emoji to be used for this label for space constrained UI"))
diff --git a/funnel/models/label.py b/funnel/models/label.py
index 58ac4fde0..8c72ac407 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -44,6 +44,10 @@ class Labelset(BaseScopedNameMixin, db.Model):
     #: across projects
     required = db.Column(db.Boolean, nullable=False, default=False)
 
+    #: Archived mode specifies that the labelset is no longer available for use
+    #: although all the previous records will stay in database.
+    archived = db.Column(db.Boolean, nullable=False, default=False)
+
     __table_args__ = (db.UniqueConstraint('project_id', 'name'),)
 
     def __repr__(self):
@@ -110,6 +114,10 @@ class Label(BaseScopedNameMixin, db.Model):
     #: Icon for displaying in space-constrained UI. Contains emoji
     icon_emoji = db.Column(db.Unicode(1), nullable=True)
 
+    #: Archived mode specifies that the label is no longer available for use
+    #: although all the previous records will stay in database.
+    archived = db.Column(db.Boolean, nullable=False, default=False)
+
     #: Proposals that this label is attached to
     proposals = db.relationship(Proposal, secondary=proposal_label, lazy='dynamic', backref='labels')
 
diff --git a/migrations/versions/0b25df40d307_add_labels_and_labelsets.py b/migrations/versions/0b25df40d307_add_labels_and_labelsets.py
index 9ea4f0639..dfd75808b 100644
--- a/migrations/versions/0b25df40d307_add_labels_and_labelsets.py
+++ b/migrations/versions/0b25df40d307_add_labels_and_labelsets.py
@@ -24,6 +24,7 @@ def upgrade():
         sa.Column('radio_mode', sa.Boolean(), nullable=False),
         sa.Column('restricted', sa.Boolean(), nullable=False),
         sa.Column('required', sa.Boolean(), nullable=False),
+        sa.Column('archived', sa.Boolean(), nullable=False),
         sa.Column('name', sa.Unicode(length=250), nullable=False),
         sa.Column('title', sa.Unicode(length=250), nullable=False),
         sa.Column('id', sa.Integer(), nullable=False),
@@ -38,6 +39,7 @@ def upgrade():
         sa.Column('seq', sa.Integer(), nullable=False),
         sa.Column('bgcolor', sa.Unicode(length=6), nullable=False),
         sa.Column('icon_emoji', sa.Unicode(length=1), nullable=True),
+        sa.Column('archived', sa.Boolean(), nullable=False),
         sa.Column('name', sa.Unicode(length=250), nullable=False),
         sa.Column('title', sa.Unicode(length=250), nullable=False),
         sa.Column('id', sa.Integer(), nullable=False),
diff --git a/migrations/versions/f89e3a85ed10_migrate_old_labels.py b/migrations/versions/f89e3a85ed10_migrate_old_labels.py
index b0b0a4a9d..284151684 100644
--- a/migrations/versions/f89e3a85ed10_migrate_old_labels.py
+++ b/migrations/versions/f89e3a85ed10_migrate_old_labels.py
@@ -48,6 +48,7 @@
     column('description', sa.UnicodeText()),
     column('radio_mode', sa.Boolean()),
     column('restricted', sa.Boolean()),
+    column('archived', sa.Boolean()),
     column('required', sa.Boolean()),
     column('created_at', sa.DateTime()),
     column('updated_at', sa.DateTime())
@@ -60,6 +61,7 @@
     column('bgcolor', sa.Unicode(6)),
     column('labelset_id', sa.Integer()),
     column('seq', sa.Integer()),
+    column('archived', sa.Boolean()),
     column('created_at', sa.DateTime()),
     column('updated_at', sa.DateTime())
     )
@@ -85,14 +87,15 @@ def upgrade():
             labset = conn.execute(labelset.insert().values({
                     'project_id': proj['id'], 'name': u"section", 'title': u"Section",
                     'seq': 1, 'description': "", 'radio_mode': True, 'restricted': True,
-                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now(),
+                    'archived': False
                 }).returning(labelset.c.id)).first()
 
             # add old sections as labels to the above labelset
             sections = conn.execute(section.select().where(section.c.project_id == proj['id']))
             for index, sec in enumerate(sections, start=1):
                 lab = conn.execute(label.insert().values({
-                    'name': sec['name'], 'title': sec['title'],
+                    'name': sec['name'], 'title': sec['title'], 'archived': False,
                     'labelset_id': labset[0], 'seq': index, 'bgcolor': u"CCCCCC",
                     'created_at': datetime.now(), 'updated_at': datetime.now()
                 }).returning(label.c.id, label.c.name)).first()
@@ -112,14 +115,14 @@ def upgrade():
         # technical level
         labset = conn.execute(labelset.insert().values({
             'project_id': proj['id'], 'name': u"technical-level", 'title': u"Technical Level",
-            'seq': 1, 'description': "", 'radio_mode': True, 'restricted': True,
+            'seq': 1, 'description': "", 'radio_mode': True, 'restricted': True, 'archived': False,
             'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
         }).returning(labelset.c.id)).first()
         tl_list = [('beginner', "Beginner"), ('intermediate', "Intermediate"), ('advanced', "Advanced")]
         for index, tl in enumerate(tl_list):
             tl_name, tl_title = tl
             lab = conn.execute(label.insert().values({
-                    'name': tl_name, 'title': tl_title,
+                    'name': tl_name, 'title': tl_title, 'archived': False,
                     'labelset_id': labset[0], 'seq': index, 'bgcolor': u"CCCCCC",
                     'created_at': datetime.now(), 'updated_at': datetime.now()
                 }).returning(label.c.id, label.c.name)).first()
@@ -135,14 +138,14 @@ def upgrade():
         # session type
         labset = conn.execute(labelset.insert().values({
                 'project_id': proj['id'], 'name': u"session-type", 'title': u"Session Type",
-                'seq': 1, 'description': "", 'radio_mode': True, 'restricted': True,
+                'seq': 1, 'description': "", 'radio_mode': True, 'restricted': True, 'archived': False,
                 'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
             }).returning(labelset.c.id)).first()
         st_list = [('lecture', "Lecture"), ('demo', "Demo"), ('tutorial', "Tutorial"), ('workshop', "Workshop"), ('discussion', "Discussion"), ('panel', "Panel")]
         for index, st in enumerate(st_list):
             st_name, st_title = st
             lab = conn.execute(label.insert().values({
-                    'name': st_name, 'title': st_title,
+                    'name': st_name, 'title': st_title, 'archived': False,
                     'labelset_id': labset[0], 'seq': index, 'bgcolor': u"CCCCCC",
                     'created_at': datetime.now(), 'updated_at': datetime.now()
                 }).returning(label.c.id, label.c.name)).first()

From b99b672f9b63b0e0b4953253a77dcb9a78ce48e1 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Sat, 13 Apr 2019 11:32:11 +0530
Subject: [PATCH 020/125] fixed labelview loader

---
 funnel/forms/proposal.py | 2 +-
 funnel/views/label.py    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 8fa405e11..0a58a3e4f 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -4,7 +4,7 @@
 import baseframe.forms as forms
 from flask import g
 from baseframe.forms.sqlalchemy import QuerySelectField
-from ..models import Project, Profile, Proposal, Label, Labelset
+from ..models import Project, Profile, Label, Labelset
 
 __all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm', 'ProposalMoveForm', 'get_proposal_form']
 
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 96fb9a28f..67c5bc307 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -124,10 +124,11 @@ class LabelView(UrlForView, ModelView):
         'labelset': 'labelset.name', 'label': 'name'}
 
     def loader(self, profile, project, labelset, label):
-        label = self.model.query.join(Labelset.project).filter(
-            Project.name == project,
-            Labelset.name == labelset, Label.name == label
+        proj = Project.query.join(Profile).filter(
+            Profile.name == profile, Project.name == project
             ).first_or_404()
+        lset = Labelset.query.filter_by(project=proj, name=labelset).first_or_404()
+        label = self.model.query.filter_by(labelset=lset, name=label).first_or_404()
         g.profile = label.labelset.project.profile
         return label
 

From 1ec283a4d0e836acaf68119ab699d510f1d53710 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Sat, 13 Apr 2019 11:55:25 +0530
Subject: [PATCH 021/125] added view for admins to set labels to a proposal

---
 funnel/forms/proposal.py              | 73 +++++++++++++++------------
 funnel/templates/proposal.html.jinja2 |  6 +++
 funnel/views/proposal.py              | 15 +++++-
 3 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 0a58a3e4f..5ae8a8b89 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -6,14 +6,53 @@
 from baseframe.forms.sqlalchemy import QuerySelectField
 from ..models import Project, Profile, Label, Labelset
 
-__all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm', 'ProposalMoveForm', 'get_proposal_form']
+__all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm',
+    'ProposalMoveForm', 'get_proposal_form', 'ProposalLabelsetBaseForm']
 
 
 class TransferProposal(forms.Form):
     userid = forms.UserSelectField(__("Transfer to"), validators=[forms.validators.DataRequired()])
 
 
-class ProposalForm(forms.Form):
+class ProposalLabelsetBaseForm(forms.Form):
+    """
+    This base form provides the `set_queries()` and `populate_obj_labels` methods
+    that lets you fill a proposal form with the labels and then save them.
+
+    Any Proposal form that needs to show labels, need to inherit this class.
+    """
+    def set_queries(self):
+        for labelset in self.edit_parent.labelsets:
+            labels_data = set(self.edit_obj.labels).intersection(set(labelset.labels))
+            data = labels_data.pop().name if len(labels_data) == 1 else [l.name for l in labels_data]
+            labelset_field = getattr(self, labelset.form_name)
+            if labelset_field.data == 'None' and data:
+                labelset_field.data = data
+
+    def populate_obj_labels(self, proposal):
+        """
+        Assign the appropriate labels to the proposal
+        """
+        for key in self.data.keys():
+            if key.startswith('labelset_'):
+                labelset = Labelset.query.filter_by(form_name=key, project=proposal.project).first()
+                existing_labels = set(labelset.labels).intersection(set(proposal.labels))
+                # in case of MultiSelectField, self.data.get(key) is a list
+                label_names = self.data.get(key) if isinstance(self.data.get(key), list) else [self.data.get(key)]
+                new_labels = [Label.query.filter_by(labelset=labelset, name=lname).first() for lname in label_names]
+                if labelset.radio_mode:
+                    for nlabel in new_labels:
+                        proposal.assign_label(nlabel)
+                else:
+                    # FIXME: Move this part inside model?
+                    removed_labels = existing_labels.difference(set(new_labels))
+                    for rlabel in removed_labels:
+                        proposal.labels.remove(rlabel)
+                    for nlabel in new_labels:
+                        proposal.assign_label(nlabel)
+
+
+class ProposalForm(ProposalLabelsetBaseForm):
     speaking = forms.RadioField(__("Are you speaking?"), coerce=int,
         choices=[(1, __(u"I will be speaking")),
                  (0, __(u"I’m proposing a topic for someone to speak on"))])
@@ -60,36 +99,6 @@ def __init__(self, *args, **kwargs):
         if project.proposal_part_b.get('hint'):
             self.description.description = project.proposal_part_b.get('hint')
 
-    def set_queries(self):
-        for labelset in self.edit_parent.labelsets:
-            labels_data = set(self.edit_obj.labels).intersection(set(labelset.labels))
-            data = labels_data.pop().name if len(labels_data) == 1 else [l.name for l in labels_data]
-            labelset_field = getattr(self, labelset.form_name)
-            if labelset_field.data == 'None' and data:
-                labelset_field.data = data
-
-    def populate_obj_labels(self, proposal):
-        """
-        Assign the appropriate labels to the proposal
-        """
-        for key in self.data.keys():
-            if key.startswith('labelset_'):
-                labelset = Labelset.query.filter_by(form_name=key, project=proposal.project).first()
-                existing_labels = set(labelset.labels).intersection(set(proposal.labels))
-                # in case of MultiSelectField, self.data.get(key) is a list
-                label_names = self.data.get(key) if isinstance(self.data.get(key), list) else [self.data.get(key)]
-                new_labels = [Label.query.filter_by(labelset=labelset, name=lname).first() for lname in label_names]
-                if labelset.radio_mode:
-                    for nlabel in new_labels:
-                        proposal.assign_label(nlabel)
-                else:
-                    # FIXME: Move this part inside model?
-                    removed_labels = existing_labels.difference(set(new_labels))
-                    for rlabel in removed_labels:
-                        proposal.labels.remove(rlabel)
-                    for nlabel in new_labels:
-                        proposal.assign_label(nlabel)
-
 
 def get_proposal_form(base_form_class, *args, **kwargs):
     """
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 84920046a..30f96cdc6 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -203,6 +203,12 @@
                     {% endfor %}
                   </p>
                 </form>
+                <hr class="mui-divider">
+                <div>
+                  <ol class="mui-list--aligned">
+                    <li><a href="{{ proposal.url_for('edit_labels') }}">Edit labels</a></li>
+                  </ol>
+                </div>
               {% endif %}
             </div>
           </div>
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index 404053909..cbb79b5f7 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -13,7 +13,7 @@
 
 from .. import app, funnelapp, lastuser
 from ..models import db, Section, Proposal, Comment, Label, Labelset
-from ..forms import (ProposalForm, CommentForm, DeleteCommentForm,
+from ..forms import (ProposalForm, CommentForm, DeleteCommentForm, ProposalLabelsetBaseForm,
     ProposalTransitionForm, ProposalMoveForm, get_proposal_form)
 from .mixins import ProjectViewMixin, ProposalViewMixin
 from .decorators import legacy_redirect
@@ -252,6 +252,19 @@ def schedule(self):
         from .session import session_form
         return session_form(self.obj.project, proposal=self.obj)
 
+    @route('labels', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @requires_permission('admin')
+    def edit_labels(self):
+        form = get_proposal_form(ProposalLabelsetBaseForm, obj=self.obj, parent=self.obj.project)
+        if form.validate_on_submit():
+            form.populate_obj_labels(self.obj)
+            db.session.commit()
+            flash(_("Labels have been saved for this proposal."), 'info')
+            return redirect(self.obj.url_for(), 303)
+        return render_form(form=form, submit=_("Save changes"),
+            title=_("Edit labels for '{}'".format(self.obj.title)))
+
 
 @route('/<project>/<url_id_name>', subdomain='<profile>')
 class FunnelProposalView(ProposalView):

From 97ab0c82d1acffedec7fce8053c7dd5417a5e1fa Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Mon, 15 Apr 2019 12:26:48 +0530
Subject: [PATCH 022/125] fixed new form

---
 funnel/forms/proposal.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 5ae8a8b89..2fd61604f 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -22,12 +22,14 @@ class ProposalLabelsetBaseForm(forms.Form):
     Any Proposal form that needs to show labels, need to inherit this class.
     """
     def set_queries(self):
-        for labelset in self.edit_parent.labelsets:
-            labels_data = set(self.edit_obj.labels).intersection(set(labelset.labels))
-            data = labels_data.pop().name if len(labels_data) == 1 else [l.name for l in labels_data]
-            labelset_field = getattr(self, labelset.form_name)
-            if labelset_field.data == 'None' and data:
-                labelset_field.data = data
+        if self.edit_obj is not None:
+            # If it's an edit form, select the proper label for each labelset
+            for labelset in self.edit_parent.labelsets:
+                labels_data = set(self.edit_obj.labels).intersection(set(labelset.labels))
+                data = labels_data.pop().name if len(labels_data) == 1 else [l.name for l in labels_data]
+                labelset_field = getattr(self, labelset.form_name)
+                if labelset_field.data == 'None' and data:
+                    labelset_field.data = data
 
     def populate_obj_labels(self, proposal):
         """
@@ -117,9 +119,7 @@ def get_proposal_form(base_form_class, *args, **kwargs):
                     continue
                 FieldType = forms.RadioField if labelset.radio_mode else forms.SelectMultipleField
                 validators = [forms.validators.DataRequired()] if labelset.required else []
-                if 'obj' in kwargs:
-                    # Edit form
-                    choices = [(l.name, l.title) for l in labelset.labels]
+                choices = [(l.name, l.title) for l in labelset.labels]
                 setattr(base_form_class, ls_name, FieldType(labelset.title, validators=validators,
                     choices=choices, description=labelset.description))
     return base_form_class(*args, **kwargs)

From 32e0db54716fc16844262dfc20c23dada9a04039 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Mon, 15 Apr 2019 12:28:08 +0530
Subject: [PATCH 023/125] comment

---
 funnel/forms/proposal.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 2fd61604f..158f49c4d 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -106,7 +106,8 @@ def get_proposal_form(base_form_class, *args, **kwargs):
     """
     Takes a proposal form class as base form and adds the labelset fields to it.
     Dynamic fields can only be added to the form class and not instance. Hence this.
-    Any form that has `obj=<proposal_object>` passed to it, can be used with this function.
+    Any form that has `obj=<proposal_object>` or `parent=<proposal_parent_obj>`
+    passed to it, can be used with this function.
     `parent` kwarg must be provided, otherwise the labelsets wont be added to the form.
     """
     if 'parent' in kwargs:

From eee9e83bebf8e820e40c8915896ddac47b5d9937 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Mon, 15 Apr 2019 14:13:03 +0530
Subject: [PATCH 024/125] fixed label loading in dynamic form

---
 funnel/forms/proposal.py              | 51 ++++++++++++++-------------
 funnel/templates/proposal.html.jinja2 |  4 ++-
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 158f49c4d..40753464b 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -22,36 +22,40 @@ class ProposalLabelsetBaseForm(forms.Form):
     Any Proposal form that needs to show labels, need to inherit this class.
     """
     def set_queries(self):
-        if self.edit_obj is not None:
-            # If it's an edit form, select the proper label for each labelset
+        if self.edit_parent is not None:
+            # Fill up the choices for the labelsets
             for labelset in self.edit_parent.labelsets:
-                labels_data = set(self.edit_obj.labels).intersection(set(labelset.labels))
-                data = labels_data.pop().name if len(labels_data) == 1 else [l.name for l in labels_data]
                 labelset_field = getattr(self, labelset.form_name)
-                if labelset_field.data == 'None' and data:
-                    labelset_field.data = data
+                labelset_field.choices = [(l.name, l.title) for l in labelset.labels]
+                if self.edit_obj is not None:
+                    # If it's an edit form, select the proper label for each labelset
+                    labels_data = set(self.edit_obj.labels).intersection(set(labelset.labels))
+                    data = labels_data.pop().name if len(labels_data) == 1 else [l.name for l in labels_data]
+                    if labelset_field.data == 'None' and data:
+                        labelset_field.data = data
 
     def populate_obj_labels(self, proposal):
         """
         Assign the appropriate labels to the proposal
         """
-        for key in self.data.keys():
-            if key.startswith('labelset_'):
-                labelset = Labelset.query.filter_by(form_name=key, project=proposal.project).first()
+        labelset_keys = [key for key in self.data.keys() if key.startswith('labelset_')]
+        for key in labelset_keys:
+            labelset = Labelset.query.filter_by(form_name=key, project=proposal.project).first()
+            if labelset.radio_mode:
+                # in case of RadioField, self.data.get(key) should be a single value
+                new_label = Label.query.filter_by(labelset=labelset, name=self.data.get(key)).first()
+                proposal.assign_label(new_label)
+            else:
+                # FIXME: Move this part inside model?
                 existing_labels = set(labelset.labels).intersection(set(proposal.labels))
-                # in case of MultiSelectField, self.data.get(key) is a list
-                label_names = self.data.get(key) if isinstance(self.data.get(key), list) else [self.data.get(key)]
-                new_labels = [Label.query.filter_by(labelset=labelset, name=lname).first() for lname in label_names]
-                if labelset.radio_mode:
-                    for nlabel in new_labels:
-                        proposal.assign_label(nlabel)
-                else:
-                    # FIXME: Move this part inside model?
-                    removed_labels = existing_labels.difference(set(new_labels))
-                    for rlabel in removed_labels:
-                        proposal.labels.remove(rlabel)
-                    for nlabel in new_labels:
-                        proposal.assign_label(nlabel)
+                # in case of MultiSelectField, self.data.get(key) should be a list
+                label_names = self.data.get(key)
+                new_labels = Label.query.filter(Label.labelset == labelset, Label.name.in_(label_names)).all()
+                removed_labels = existing_labels.difference(set(new_labels))
+                for rlabel in removed_labels:
+                    proposal.labels.remove(rlabel)
+                for nlabel in new_labels:
+                    proposal.assign_label(nlabel)
 
 
 class ProposalForm(ProposalLabelsetBaseForm):
@@ -120,9 +124,8 @@ def get_proposal_form(base_form_class, *args, **kwargs):
                     continue
                 FieldType = forms.RadioField if labelset.radio_mode else forms.SelectMultipleField
                 validators = [forms.validators.DataRequired()] if labelset.required else []
-                choices = [(l.name, l.title) for l in labelset.labels]
                 setattr(base_form_class, ls_name, FieldType(labelset.title, validators=validators,
-                    choices=choices, description=labelset.description))
+                    choices=[], description=labelset.description))
     return base_form_class(*args, **kwargs)
 
 
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 30f96cdc6..714f62d41 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -102,7 +102,9 @@
           {%- for label in proposal.labels %}
             <span class="label mui--text-bold js-labels" data-bgcolor="#{{ label.bgcolor }}">{{ label.labelset.title }}: {{ label.title }}</span>
           {%- endfor %}
-          <a class="label mui--text-bold mui--text-light">+ Add label</a>
+          {%- if proposal.current_roles.admin %}
+            <a class="label mui--text-bold mui--text-light" href="{{ proposal.url_for('edit_labels') }}">+ Add label</a>
+          {%- endif %}
         </div>
       </div>
     </section>

From e74f8dbcaa942b7fd8be5eae167efbe722195db0 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Mon, 15 Apr 2019 18:13:39 +0530
Subject: [PATCH 025/125] Fix labels UI

---
 funnel/static/css/app.css             |  5 +++++
 funnel/static/sass/_proposal.scss     |  5 +++++
 funnel/templates/proposal.html.jinja2 | 10 +++-------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index cd166cd35..83c551a1c 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -1011,6 +1011,11 @@ html.touch .collapsible__body--disable {
   border-radius: 20px;
   display: inline-block;
   margin: 0 10px 10px 0;
+  text-decoration: none;
+}
+
+.label:hover {
+  text-decoration: none;
 }
 
 .proposal-list-header {
diff --git a/funnel/static/sass/_proposal.scss b/funnel/static/sass/_proposal.scss
index 501eba08e..bcf880926 100644
--- a/funnel/static/sass/_proposal.scss
+++ b/funnel/static/sass/_proposal.scss
@@ -315,4 +315,9 @@
   border-radius: 20px;
   display: inline-block;
   margin: 0 10px 10px 0;
+  text-decoration: none;
+}
+
+.label:hover {
+  text-decoration: none;
 }
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 30f96cdc6..7945a1884 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -102,7 +102,9 @@
           {%- for label in proposal.labels %}
             <span class="label mui--text-bold js-labels" data-bgcolor="#{{ label.bgcolor }}">{{ label.labelset.title }}: {{ label.title }}</span>
           {%- endfor %}
-          <a class="label mui--text-bold mui--text-light">+ Add label</a>
+          {% if proposal.current_roles.admin %}
+            <a href="{{ proposal.url_for('edit_labels') }}" class="label mui--text-bold mui--text-light">Edit labels</a>
+          {%- endif %}
         </div>
       </div>
     </section>
@@ -203,12 +205,6 @@
                     {% endfor %}
                   </p>
                 </form>
-                <hr class="mui-divider">
-                <div>
-                  <ol class="mui-list--aligned">
-                    <li><a href="{{ proposal.url_for('edit_labels') }}">Edit labels</a></li>
-                  </ol>
-                </div>
               {% endif %}
             </div>
           </div>

From e99e34b436972c8cf710ce666e30844c56303c81 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 15 Apr 2019 19:18:23 +0530
Subject: [PATCH 026/125] Remove LabelSet

Labels can refer to other labels as parents, which then effectively behave like sets.
---
 funnel/models/label.py   | 160 +++++++++++++++++++--------------------
 funnel/models/project.py |   6 +-
 2 files changed, 80 insertions(+), 86 deletions(-)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index 8c72ac407..64cc5a98a 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -1,130 +1,114 @@
 # -*- coding: utf-8 -*-
 
-from sqlalchemy import func
+from sqlalchemy.sql import exists
 from sqlalchemy.ext.orderinglist import ordering_list
 from sqlalchemy.ext.hybrid import hybrid_property
 
-from coaster.sqlalchemy import with_roles
-
 from . import db, BaseScopedNameMixin
 from .project import Project
 from .proposal import Proposal
 
 
-class Labelset(BaseScopedNameMixin, db.Model):
-    """
-    A collection of labels, in checkbox mode (select multiple) or radio mode (select one). A project can
-    contain multiple labelsets.
-    """
-    __tablename__ = 'labelset'
+proposal_label = db.Table(
+    'proposal_label', db.Model.metadata,
+    db.Column('proposal_id', None, db.ForeignKey('proposal.id', ondelete='CASCADE'), nullable=False, primary_key=True),
+    db.Column('label_id', None, db.ForeignKey('label.id', ondelete='CASCADE'), nullable=False, primary_key=True, index=True),
+    db.Column('created_at', db.DateTime, default=db.func.utcnow())
+)
+
+
+class Label(BaseScopedNameMixin, db.Model):
+    __tablename__ = 'label'
 
     project_id = db.Column(None, db.ForeignKey('project.id', ondelete='CASCADE'), nullable=False)
     project = db.relationship(Project)  # Backref is defined in the Project model with an ordering list
+    # `parent` is required for :meth:`~coaster.sqlalchemy.mixins.BaseScopedNameMixin.make_name()`
     parent = db.synonym('project')
 
-    labels = db.relationship('Label', cascade='all, delete-orphan',
-        order_by='Label.seq', collection_class=ordering_list('seq', count_from=1))
+    _parent_label_id = db.Column(
+        'parent_label_id',
+        None,
+        db.ForeignKey('label.id', ondelete='CASCADE', use_alter=True, name='label_parent_label_id_fkey'),
+        index=True,
+        nullable=True
+    )
+    # See https://docs.sqlalchemy.org/en/13/orm/self_referential.html
+    children = db.relationship(
+        'Label',
+        backref=db.backref('parent_label', remote_side='Label.id'),
+        order_by='Label.seq',
+        collection_class=ordering_list('seq', count_from=1)
+    )
+
+    # TODO: Add sqlalchemy validator for `parent_label` to ensure the parent's project matches.
+    # Ideally add a SQL post-update trigger as well (code is in coaster's add_primary_relationship)
 
-    #: Sequence number for this labelset, used in UI for ordering
+    #: Sequence number for this label, used in UI for ordering
     seq = db.Column(db.Integer, nullable=False)
 
-    # A single-line description of this labelset, shown when applying labels
+    # A single-line description of this label, shown when picking labels (optional)
     description = db.Column(db.UnicodeText, nullable=False)
 
-    #: Radio mode specifies that only one of the labels in this set may be applied on a project
-    radio_mode = db.Column(db.Boolean, nullable=False, default=False)
+    #: Icon for displaying in space-constrained UI. Contains one emoji symbol.
+    #: Since emoji can be composed from multiple symbols, there is no length
+    #: limit imposed here
+    icon_emoji = db.Column(db.UnicodeText, nullable=True)
 
     #: Restricted mode specifies that labels in this set may only be applied by someone with
     #: an editorial role (TODO: name the role)
-    restricted = db.Column(db.Boolean, nullable=False, default=False)
+    _restricted = db.Column('restricted', db.Boolean, nullable=False, default=False)
 
-    #: Required mode specifies that a label from this set must be applied on a proposal.
-    #: This is not foolproof and can be violated under a variety of conditions including
-    #: (a) this flag being set after a proposal is created, and (b) a proposal being moved
-    #: across projects
-    required = db.Column(db.Boolean, nullable=False, default=False)
+    #: Required mode signals to UI that if this label is a parent, one of its
+    #: children must be mandatorily applied to the proposal. The value of this
+    #: field must be ignored if the label is not a parent
+    _required = db.Column('required', db.Boolean, nullable=False, default=False)
 
-    #: Archived mode specifies that the labelset is no longer available for use
+    #: Archived mode specifies that the label is no longer available for use
     #: although all the previous records will stay in database.
-    archived = db.Column(db.Boolean, nullable=False, default=False)
+    _archived = db.Column('archived', db.Boolean, nullable=False, default=False)
 
-    __table_args__ = (db.UniqueConstraint('project_id', 'name'),)
+    #: Proposals that this label is attached to
+    proposals = db.relationship(Proposal, secondary=proposal_label, lazy='dynamic', backref='labels')
 
-    def __repr__(self):
-        return "<Labelset %s in %s>" % (self.name, self.project.name)
+    __table_args__ = (db.UniqueConstraint('project_id', 'name'),)
 
     __roles__ = {
         'all': {
             'read': {
-                'name', 'title', 'project_id', 'seq', 'description', 'radio_code',
-                'restricted', 'required'
+                'name', 'title', 'project_id', 'project', 'seq',
+                'restricted', 'required', 'archived'
             }
         }
     }
 
     @hybrid_property
-    def form_name(self):
-        """
-        Generates a name to be used in forms when a field is created for this labelset
-        """
-        return 'labelset_' + self.name.replace('-', '_')
+    def restricted(self):
+        return self.parent_label._restricted if self.parent_label else self._restricted
 
-    @form_name.expression
-    def form_name(cls):
-        return func.concat('labelset_', func.replace(cls.name, '-', '_'))
-
-    def roles_for(self, actor=None, anchors=()):
-        roles = super(Labelset, self).roles_for(actor, anchors)
-        roles.update(self.project.roles_for(actor, anchors))
-        return roles
-
-    @with_roles(call={'admin'})
-    def assign_label(self, label):
-        """
-        This function takes a Label object and links the labelset with it.
-        This function requires role control. Hence this function must be called
-        via ``current_access()``.
-
-        :param label: A Label instance
-        """
-        self.labels.append(label)
-
-
-proposal_label = db.Table(
-    'proposal_label', db.Model.metadata,
-    db.Column('proposal_id', None, db.ForeignKey('proposal.id', ondelete='CASCADE'), nullable=False, primary_key=True),
-    db.Column('label_id', None, db.ForeignKey('label.id', ondelete='CASCADE'), nullable=False, primary_key=True, index=True),
-    db.Column('created_at', db.DateTime, default=db.func.utcnow())
-)
-
-
-class Label(BaseScopedNameMixin, db.Model):
-    __tablename__ = 'label'
-
-    labelset_id = db.Column(None, db.ForeignKey('labelset.id', ondelete='CASCADE'), nullable=False)
-    labelset = db.relationship(Labelset)
-    parent = db.synonym('labelset')
-
-    #: Color code to be used in UI with this label
-    bgcolor = db.Column(db.Unicode(6), nullable=False, default=u"CCCCCC")
-
-    #: Sequence number for this label, used in UI for ordering
-    seq = db.Column(db.Integer, nullable=False)
+    @hybrid_property
+    def archived(self):
+        return self._archived or self.parent_label._archived if self.parent_label else False
 
-    #: Icon for displaying in space-constrained UI. Contains emoji
-    icon_emoji = db.Column(db.Unicode(1), nullable=True)
+    # TODO: setter and expression for :meth:`restricted`, :meth:`archived`
 
-    #: Archived mode specifies that the label is no longer available for use
-    #: although all the previous records will stay in database.
-    archived = db.Column(db.Boolean, nullable=False, default=False)
+    @hybrid_property
+    def is_parent(self):
+        return len(self.children) != 0
 
-    #: Proposals that this label is attached to
-    proposals = db.relationship(Proposal, secondary=proposal_label, lazy='dynamic', backref='labels')
+    # TODO: Check whether this expression works
+    @is_parent.expression
+    def is_parent(cls):
+        return exists().where(Label._parent_label_id == cls.id)
 
-    __table_args__ = (db.UniqueConstraint('labelset_id', 'name'),)
+    @hybrid_property
+    def required(self):
+        return self._required
 
-    def __repr__(self):
-        return "<Label %s/%s>" % (self.labelset.name, self.name)
+    @required.setter
+    def required(self, value):
+        if value and not self.children:
+            raise ValueError("Label without children cannot be required")
+        self._required = value
 
     @property
     def icon(self):
@@ -140,3 +124,11 @@ def icon(self):
             if len(result) <= 1:
                 result = self.title.strip()[:3]
         return result
+
+    def __repr__(self):
+        return "<Label %s/%s>" % (self.labelset.name, self.name)
+
+    def roles_for(self, actor=None, anchors=()):
+        roles = super(Label, self).roles_for(actor, anchors)
+        roles.update(self.project.roles_for(actor, anchors))
+        return roles
diff --git a/funnel/models/project.py b/funnel/models/project.py
index 9de8795a0..a47dbe2cd 100644
--- a/funnel/models/project.py
+++ b/funnel/models/project.py
@@ -132,8 +132,10 @@ class Project(UuidMixin, BaseScopedNameMixin, db.Model):
 
     venues = db.relationship('Venue', cascade='all, delete-orphan',
         order_by='Venue.seq', collection_class=ordering_list('seq', count_from=1))
-    labelsets = db.relationship('Labelset', cascade='all, delete-orphan',
-        order_by='Labelset.seq', collection_class=ordering_list('seq', count_from=1))
+    labels = db.relationship('Label', cascade='all, delete-orphan',
+        primaryjoin='and_(Label.project_id == Project.id, Label.parent_label_id == None)',
+        order_by='Label.seq', collection_class=ordering_list('seq', count_from=1))
+    all_labels = db.relationship('Label', lazy='dynamic')
 
     featured_sessions = db.relationship(
         'Session',

From b733c6b1f55a6808ddc2cbe8e548e6d70aba2b1d Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 15 Apr 2019 19:19:14 +0530
Subject: [PATCH 027/125] Use self.is_parent

---
 funnel/models/label.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index 64cc5a98a..12cc91f49 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -106,7 +106,7 @@ def required(self):
 
     @required.setter
     def required(self, value):
-        if value and not self.children:
+        if value and not self.is_parent:
             raise ValueError("Label without children cannot be required")
         self._required = value
 

From c3f61e6ad498900f41b0c00e24a50c616fb929a7 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 15 Apr 2019 19:22:43 +0530
Subject: [PATCH 028/125] Required flag must be false if not a parent label

---
 funnel/models/label.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index 12cc91f49..fb3ba0ced 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -102,7 +102,7 @@ def is_parent(cls):
 
     @hybrid_property
     def required(self):
-        return self._required
+        return self._required if self.is_parent else False
 
     @required.setter
     def required(self, value):

From c838cf31e7af77ca87a3a0e4548c51259ef8938f Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Tue, 16 Apr 2019 12:10:06 +0530
Subject: [PATCH 029/125] Updated docstrings

---
 funnel/models/label.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index fb3ba0ced..fa26264e7 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -25,6 +25,8 @@ class Label(BaseScopedNameMixin, db.Model):
     # `parent` is required for :meth:`~coaster.sqlalchemy.mixins.BaseScopedNameMixin.make_name()`
     parent = db.synonym('project')
 
+    #: Parent label's id. Do not write to this column directly, as we don't have the ability to
+    #: validate the value within the app. Always use the :attr:`parent_label` relationship.
     _parent_label_id = db.Column(
         'parent_label_id',
         None,
@@ -54,8 +56,9 @@ class Label(BaseScopedNameMixin, db.Model):
     #: limit imposed here
     icon_emoji = db.Column(db.UnicodeText, nullable=True)
 
-    #: Restricted mode specifies that labels in this set may only be applied by someone with
-    #: an editorial role (TODO: name the role)
+    #: Restricted mode specifies that this label may only be applied by someone with
+    #: an editorial role (TODO: name the role). If this label is a parent, it applies
+    #: to all its children
     _restricted = db.Column('restricted', db.Boolean, nullable=False, default=False)
 
     #: Required mode signals to UI that if this label is a parent, one of its

From 81f65a3ba1052399d5747d9d7fcb78ff6a384deb Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Tue, 16 Apr 2019 12:17:04 +0530
Subject: [PATCH 030/125] Don't need use_alter for self-referential

---
 funnel/models/label.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index fa26264e7..0e6f3d6ab 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -30,7 +30,7 @@ class Label(BaseScopedNameMixin, db.Model):
     _parent_label_id = db.Column(
         'parent_label_id',
         None,
-        db.ForeignKey('label.id', ondelete='CASCADE', use_alter=True, name='label_parent_label_id_fkey'),
+        db.ForeignKey('label.id', ondelete='CASCADE'),
         index=True,
         nullable=True
     )

From ba9670c96a7ed82624a9e3653826d1877be10cf7 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Tue, 16 Apr 2019 12:17:33 +0530
Subject: [PATCH 031/125] Rename part_labels (column rename also needed)

---
 funnel/models/project.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/funnel/models/project.py b/funnel/models/project.py
index a47dbe2cd..d8c9600fa 100644
--- a/funnel/models/project.py
+++ b/funnel/models/project.py
@@ -128,7 +128,7 @@ class Project(UuidMixin, BaseScopedNameMixin, db.Model):
     parent_id = db.Column(None, db.ForeignKey('project.id', ondelete='SET NULL'), nullable=True)
     parent_project = db.relationship('Project', remote_side='Project.id', backref='subprojects')
     inherit_sections = db.Column(db.Boolean, default=True, nullable=False)
-    labels = db.Column(JsonDict, nullable=False, server_default='{}')
+    part_labels = db.Column('labels', JsonDict, nullable=False, server_default='{}')
 
     venues = db.relationship('Venue', cascade='all, delete-orphan',
         order_by='Venue.seq', collection_class=ordering_list('seq', count_from=1))
@@ -358,11 +358,11 @@ def location_geonameid(self):
 
     @property
     def proposal_part_a(self):
-        return self.labels.get('proposal', {}).get('part_a', {})
+        return self.part_labels.get('proposal', {}).get('part_a', {})
 
     @property
     def proposal_part_b(self):
-        return self.labels.get('proposal', {}).get('part_b', {})
+        return self.part_labels.get('proposal', {}).get('part_b', {})
 
     def set_labels(self, value=None):
         """
@@ -373,9 +373,9 @@ def set_labels(self, value=None):
         are allowed to be customized per project.
         """
         if value and isinstance(value, dict):
-            self.labels = value
+            self.part_labels = value
         else:
-            self.labels = {
+            self.part_labels = {
                 "proposal": {
                     "part_a": {
                         "title": "Abstract",

From 9b5740e08685ca47a3dc77888292d04895c62ba4 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 16 Apr 2019 12:19:59 +0530
Subject: [PATCH 032/125] added setter and expression for restricted and
 archived

---
 funnel/models/label.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index fb3ba0ced..379461bb5 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -85,10 +85,26 @@ class Label(BaseScopedNameMixin, db.Model):
     def restricted(self):
         return self.parent_label._restricted if self.parent_label else self._restricted
 
+    @restricted.setter
+    def restricted(self, value):
+        self._restricted = value
+
+    @restricted.expression
+    def restricted(cls):
+        return cls._restricted == True  # NOQA
+
     @hybrid_property
     def archived(self):
         return self._archived or self.parent_label._archived if self.parent_label else False
 
+    @archived.setter
+    def archived(self, value):
+        self._archived = value
+
+    @archived.expression
+    def archived(cls):
+        return cls._archived == True  # NOQA
+
     # TODO: setter and expression for :meth:`restricted`, :meth:`archived`
 
     @hybrid_property

From 12a2d17e0f57d2cc42ebde32b9b39a0668314894 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 16 Apr 2019 13:53:34 +0530
Subject: [PATCH 033/125] modified migration for labels

---
 funnel/models/label.py                        |  12 +-
 funnel/models/proposal.py                     |  12 +-
 ...abelsets.py => 0b25df40d307_add_labels.py} |  35 ++--
 .../f89e3a85ed10_migrate_old_labels.py        | 166 ------------------
 runtests.sh                                   |   1 +
 tests/conftest.py                             |  47 ++---
 tests/unit/models/test_label.py               |  62 +++----
 7 files changed, 82 insertions(+), 253 deletions(-)
 rename migrations/versions/{0b25df40d307_add_labels_and_labelsets.py => 0b25df40d307_add_labels.py} (59%)
 delete mode 100644 migrations/versions/f89e3a85ed10_migrate_old_labels.py

diff --git a/funnel/models/label.py b/funnel/models/label.py
index 943203169..604c24a6f 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -27,7 +27,7 @@ class Label(BaseScopedNameMixin, db.Model):
 
     #: Parent label's id. Do not write to this column directly, as we don't have the ability to
     #: validate the value within the app. Always use the :attr:`parent_label` relationship.
-    _parent_label_id = db.Column(
+    parent_label_id = db.Column(
         'parent_label_id',
         None,
         db.ForeignKey('label.id', ondelete='CASCADE'),
@@ -49,7 +49,7 @@ class Label(BaseScopedNameMixin, db.Model):
     seq = db.Column(db.Integer, nullable=False)
 
     # A single-line description of this label, shown when picking labels (optional)
-    description = db.Column(db.UnicodeText, nullable=False)
+    description = db.Column(db.UnicodeText, nullable=False, default=u"")
 
     #: Icon for displaying in space-constrained UI. Contains one emoji symbol.
     #: Since emoji can be composed from multiple symbols, there is no length
@@ -108,13 +108,10 @@ def archived(self, value):
     def archived(cls):
         return cls._archived == True  # NOQA
 
-    # TODO: setter and expression for :meth:`restricted`, :meth:`archived`
-
     @hybrid_property
     def is_parent(self):
         return len(self.children) != 0
 
-    # TODO: Check whether this expression works
     @is_parent.expression
     def is_parent(cls):
         return exists().where(Label._parent_label_id == cls.id)
@@ -145,7 +142,10 @@ def icon(self):
         return result
 
     def __repr__(self):
-        return "<Label %s/%s>" % (self.labelset.name, self.name)
+        if self.parent_label:
+            return "<Label %s/%s>" % (self.parent_label.name, self.name)
+        else:
+            return "<Label %s>" % self.name
 
     def roles_for(self, actor=None, anchors=()):
         roles = super(Label, self).roles_for(actor, anchors)
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 65d151aa5..a0f9fbf50 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -334,6 +334,7 @@ def permissions(self, user, inherited=None):
                 'vote_proposal',
                 'new_comment',
                 'vote_comment',
+                'edit-proposal'
                 ])
             if user == self.owner:
                 perms.update([
@@ -364,14 +365,17 @@ def assign_label(self, label):
         """
         if label in self.labels:
             return
-        if label.labelset.radio_mode:
-            existing_labels = set(label.labelset.labels).intersection(set(self.labels))
+        if label.is_parent:
+            raise ValueError("Parent labels cannot be assigned to a proposal")
+
+        if label.parent_label is not None:
+            existing_labels = set(label.parent_label.children).intersection(set(self.labels))
             if existing_labels:
                 # the labelset is in radio mode and one of it's labels are
                 # already assigned to this proposal. We need to
                 # remove the older label and assign given label.
-                existing_label = existing_labels.pop()
-                self.labels.remove(existing_label)
+                for elabel in existing_labels:
+                    self.labels.remove(elabel)
         # labelset is not in radio mode, so we can assign label to proposal
         self.labels.append(label)
 
diff --git a/migrations/versions/0b25df40d307_add_labels_and_labelsets.py b/migrations/versions/0b25df40d307_add_labels.py
similarity index 59%
rename from migrations/versions/0b25df40d307_add_labels_and_labelsets.py
rename to migrations/versions/0b25df40d307_add_labels.py
index dfd75808b..f4c6b3dbe 100644
--- a/migrations/versions/0b25df40d307_add_labels_and_labelsets.py
+++ b/migrations/versions/0b25df40d307_add_labels.py
@@ -1,7 +1,7 @@
-"""add labels and labelsets
+"""add labels
 
-Revision ID: 0b25df40d307
-Revises: ef93d256a8cf
+# Revision ID: 0b25df40d307
+# Revises: ef93d256a8cf
 Create Date: 2019-04-08 14:44:05.164533
 
 """
@@ -15,37 +15,23 @@
 
 
 def upgrade():
-    op.create_table('labelset',
-        sa.Column('created_at', sa.DateTime(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), nullable=False),
-        sa.Column('project_id', sa.Integer(), nullable=False),
-        sa.Column('seq', sa.Integer(), nullable=False),
-        sa.Column('description', sa.UnicodeText(), nullable=False),
-        sa.Column('radio_mode', sa.Boolean(), nullable=False),
-        sa.Column('restricted', sa.Boolean(), nullable=False),
-        sa.Column('required', sa.Boolean(), nullable=False),
-        sa.Column('archived', sa.Boolean(), nullable=False),
-        sa.Column('name', sa.Unicode(length=250), nullable=False),
-        sa.Column('title', sa.Unicode(length=250), nullable=False),
-        sa.Column('id', sa.Integer(), nullable=False),
-        sa.ForeignKeyConstraint(['project_id'], ['project.id'], ondelete='CASCADE'),
-        sa.PrimaryKeyConstraint('id'),
-        sa.UniqueConstraint('project_id', 'name')
-    )
     op.create_table('label',
         sa.Column('created_at', sa.DateTime(), nullable=False),
         sa.Column('updated_at', sa.DateTime(), nullable=False),
-        sa.Column('labelset_id', sa.Integer(), nullable=False),
+        sa.Column('parent_label_id', sa.Integer(), nullable=False),
         sa.Column('seq', sa.Integer(), nullable=False),
+        sa.Column('description', sa.UnicodeText(), nullable=False),
         sa.Column('bgcolor', sa.Unicode(length=6), nullable=False),
-        sa.Column('icon_emoji', sa.Unicode(length=1), nullable=True),
+        sa.Column('icon_emoji', sa.UnicodeText(), nullable=True),
         sa.Column('archived', sa.Boolean(), nullable=False),
+        sa.Column('restricted', sa.Boolean(), nullable=False),
+        sa.Column('required', sa.Boolean(), nullable=False),
         sa.Column('name', sa.Unicode(length=250), nullable=False),
         sa.Column('title', sa.Unicode(length=250), nullable=False),
         sa.Column('id', sa.Integer(), nullable=False),
-        sa.ForeignKeyConstraint(['labelset_id'], ['labelset.id'], ondelete='CASCADE'),
+        sa.ForeignKeyConstraint(['parent_label_id'], ['label.id'], ondelete='CASCADE'),
         sa.PrimaryKeyConstraint('id'),
-        sa.UniqueConstraint('labelset_id', 'name')
+        sa.UniqueConstraint('parent_label_id', 'name')
     )
     op.create_table('proposal_label',
         sa.Column('proposal_id', sa.Integer(), nullable=False),
@@ -62,4 +48,3 @@ def downgrade():
     op.drop_index(op.f('ix_proposal_label_label_id'), table_name='proposal_label')
     op.drop_table('proposal_label')
     op.drop_table('label')
-    op.drop_table('labelset')
diff --git a/migrations/versions/f89e3a85ed10_migrate_old_labels.py b/migrations/versions/f89e3a85ed10_migrate_old_labels.py
deleted file mode 100644
index 284151684..000000000
--- a/migrations/versions/f89e3a85ed10_migrate_old_labels.py
+++ /dev/null
@@ -1,166 +0,0 @@
-"""migrate old labels
-
-Revision ID: f89e3a85ed10
-Revises: 0b25df40d307
-Create Date: 2019-04-11 14:42:55.182622
-
-"""
-
-# revision identifiers, used by Alembic.
-revision = 'f89e3a85ed10'
-down_revision = '0b25df40d307'
-
-from datetime import datetime
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.sql import table, column
-
-
-proposal = table('proposal',
-    column('id', sa.Integer()),
-    column('project_id', sa.Integer()),
-    column('technical_level', sa.Unicode(40)),
-    column('session_type', sa.Unicode(40)),
-    column('section_id', sa.Integer()),
-    )
-
-project = table('project',
-    column('id', sa.Integer()),
-    column('name', sa.Unicode(250))
-    )
-
-section = table('section',
-    column('id', sa.Integer()),
-    column('project_id', sa.Integer()),
-    column('name', sa.Unicode(250)),
-    column('title', sa.Unicode(250)),
-    column('description', sa.UnicodeText()),
-    column('created_at', sa.DateTime()),
-    column('updated_at', sa.DateTime())
-    )
-
-labelset = table('labelset',
-    column('id', sa.Integer()),
-    column('name', sa.Unicode(250)),
-    column('title', sa.Unicode(250)),
-    column('project_id', sa.Integer()),
-    column('seq', sa.Integer()),
-    column('description', sa.UnicodeText()),
-    column('radio_mode', sa.Boolean()),
-    column('restricted', sa.Boolean()),
-    column('archived', sa.Boolean()),
-    column('required', sa.Boolean()),
-    column('created_at', sa.DateTime()),
-    column('updated_at', sa.DateTime())
-    )
-
-label = table('label',
-    column('id', sa.Integer()),
-    column('name', sa.Unicode(250)),
-    column('title', sa.Unicode(250)),
-    column('bgcolor', sa.Unicode(6)),
-    column('labelset_id', sa.Integer()),
-    column('seq', sa.Integer()),
-    column('archived', sa.Boolean()),
-    column('created_at', sa.DateTime()),
-    column('updated_at', sa.DateTime())
-    )
-
-proposal_label = table('proposal_label',
-    column('proposal_id', sa.Integer()),
-    column('label_id', sa.Integer()),
-    column('created_at', sa.DateTime())
-    )
-
-
-def upgrade():
-    conn = op.get_bind()
-    # Migrate sections -
-    projects = conn.execute(project.select())
-    for proj in projects:
-        sec_count = conn.scalar(
-                sa.select([sa.func.count('*')]).select_from(section).where(section.c.project_id == proj['id'])
-            )
-        if sec_count > 0:
-            # the project has some sections
-            # create section labelset for the project
-            labset = conn.execute(labelset.insert().values({
-                    'project_id': proj['id'], 'name': u"section", 'title': u"Section",
-                    'seq': 1, 'description': "", 'radio_mode': True, 'restricted': True,
-                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now(),
-                    'archived': False
-                }).returning(labelset.c.id)).first()
-
-            # add old sections as labels to the above labelset
-            sections = conn.execute(section.select().where(section.c.project_id == proj['id']))
-            for index, sec in enumerate(sections, start=1):
-                lab = conn.execute(label.insert().values({
-                    'name': sec['name'], 'title': sec['title'], 'archived': False,
-                    'labelset_id': labset[0], 'seq': index, 'bgcolor': u"CCCCCC",
-                    'created_at': datetime.now(), 'updated_at': datetime.now()
-                }).returning(label.c.id, label.c.name)).first()
-
-                # only select proposals that belonged to above section and
-                # still in the same project as the section. This removed proposals
-                # that were moved to other projects but their section relationship
-                # was never migrated.
-                proposals = conn.execute(
-                        proposal.select().where(proposal.c.section_id == sec['id']).where(proposal.c.project_id == sec['project_id'])
-                    )
-                for prop in proposals:
-                    pl = conn.execute(proposal_label.insert().values({
-                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
-                    }))
-
-        # technical level
-        labset = conn.execute(labelset.insert().values({
-            'project_id': proj['id'], 'name': u"technical-level", 'title': u"Technical Level",
-            'seq': 1, 'description': "", 'radio_mode': True, 'restricted': True, 'archived': False,
-            'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
-        }).returning(labelset.c.id)).first()
-        tl_list = [('beginner', "Beginner"), ('intermediate', "Intermediate"), ('advanced', "Advanced")]
-        for index, tl in enumerate(tl_list):
-            tl_name, tl_title = tl
-            lab = conn.execute(label.insert().values({
-                    'name': tl_name, 'title': tl_title, 'archived': False,
-                    'labelset_id': labset[0], 'seq': index, 'bgcolor': u"CCCCCC",
-                    'created_at': datetime.now(), 'updated_at': datetime.now()
-                }).returning(label.c.id, label.c.name)).first()
-
-            proposals = conn.execute(
-                    proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.technical_level == tl_title)
-                )
-            for prop in proposals:
-                pl = conn.execute(proposal_label.insert().values({
-                    'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
-                }))
-
-        # session type
-        labset = conn.execute(labelset.insert().values({
-                'project_id': proj['id'], 'name': u"session-type", 'title': u"Session Type",
-                'seq': 1, 'description': "", 'radio_mode': True, 'restricted': True, 'archived': False,
-                'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
-            }).returning(labelset.c.id)).first()
-        st_list = [('lecture', "Lecture"), ('demo', "Demo"), ('tutorial', "Tutorial"), ('workshop', "Workshop"), ('discussion', "Discussion"), ('panel', "Panel")]
-        for index, st in enumerate(st_list):
-            st_name, st_title = st
-            lab = conn.execute(label.insert().values({
-                    'name': st_name, 'title': st_title, 'archived': False,
-                    'labelset_id': labset[0], 'seq': index, 'bgcolor': u"CCCCCC",
-                    'created_at': datetime.now(), 'updated_at': datetime.now()
-                }).returning(label.c.id, label.c.name)).first()
-
-            proposals = conn.execute(
-                    proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.session_type == st_title)
-                )
-            for prop in proposals:
-                conn.execute(proposal_label.insert().values({
-                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
-                    }))
-
-
-def downgrade():
-    conn = op.get_bind()
-    conn.execute(labelset.delete())
-    conn.execute(label.delete())
-    conn.execute(proposal_label.delete())
diff --git a/runtests.sh b/runtests.sh
index 3bbd3747c..594fb3abc 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 set -e
+export PYTHONIOENCODING="UTF-8"
 export FLASK_ENV="TESTING"
 coverage run -m pytest "$@"
 coverage report -m
diff --git a/tests/conftest.py b/tests/conftest.py
index 886d90d49..0af1088bb 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -4,10 +4,9 @@
 import pytest
 import uuid
 import coaster.app
-from coaster.auth import add_auth_attribute
 from flask_lastuser import Lastuser
 from flask_lastuser.sqlalchemy import UserManager
-from funnel.models import db, Profile, Project, User, Label, Labelset, Proposal, Team
+from funnel.models import db, Profile, Project, User, Label, Proposal, Team
 
 
 flask_app = Flask(__name__, instance_relative_config=True)
@@ -130,36 +129,42 @@ def new_project(test_db, new_profile, new_user, new_team):
 # so that changes made to the objects they return in one test function
 # doesn't affect another test function.
 
+
 @pytest.fixture(scope='function')
-def new_labelset(test_db, new_project):
-    labelset_a = Labelset(
-        title=u"Labelset A", project=new_project,
-        description=u"A test labelset", radio_mode=False,
-        restricted=False, required=False
+def new_parent_label(test_db, new_project):
+    parent_label_a = Label(
+        title=u"Parent Label A", project=new_project,
+        description=u"A test parent label"
     )
-    new_project.labelsets.append(labelset_a)
-    test_db.session.add(labelset_a)
-    test_db.session.commit()
+    new_project.labels.append(parent_label_a)
+    test_db.session.add(parent_label_a)
 
-    label_a1 = Label(
-        title=u"Label A1", icon_emoji=u"👍", labelset=labelset_a
-    )
-    labelset_a.labels.append(label_a1)
+    label_a1 = Label(title=u"Label A1", icon_emoji=u"👍", project=new_project)
     test_db.session.add(label_a1)
-    test_db.session.commit()
 
-    label_a2 = Label(
-        title=u"Label A2", labelset=labelset_a
-    )
-    labelset_a.labels.append(label_a2)
+    label_a2 = Label(title=u"Label A2", project=new_project)
     test_db.session.add(label_a2)
+
+    parent_label_a.children.append(label_a1)
+    parent_label_a.children.append(label_a2)
+    parent_label_a.required = True
+    parent_label_a.restricted = True
     test_db.session.commit()
 
-    return labelset_a
+    return parent_label_a
+
+
+@pytest.fixture(scope='function')
+def new_label(test_db, new_project):
+    label_b = Label(title=u"Label B", icon_emoji=u"🔟", project=new_project)
+    new_project.labels.append(label_b)
+    test_db.session.add(label_b)
+    test_db.session.commit()
+    return label_b
 
 
 @pytest.fixture(scope='function')
-def new_proposal(test_db, new_user, new_project, new_labelset):
+def new_proposal(test_db, new_user, new_project):
     proposal = Proposal(
         user=new_user, speaker=new_user, project=new_project,
         title=u"Test Proposal", description=u"Test proposal description",
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index 4fd8ec055..b83679101 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -1,45 +1,45 @@
 # -*- coding: utf-8 -*-
 
+import pytest
+
 
 class TestLabels(object):
-    def test_labelset_from_fixture(self, test_client, test_db, new_labelset):
-        assert new_labelset.title == u"Labelset A"
-        assert new_labelset.name == u"labelset-a"
-        assert new_labelset.seq == 1
-
-    def test_label_from_fixture(self, test_client, test_db, new_labelset):
-        assert len(new_labelset.labels) > 0
-        label_a1 = new_labelset.labels[0]
+    def test_parent_label_from_fixture(self, test_client, new_parent_label):
+        assert new_parent_label.title == u"Parent Label A"
+        assert new_parent_label.seq == 1
+        assert new_parent_label.is_parent
+        assert new_parent_label.required
+        assert new_parent_label.restricted
+        assert not new_parent_label.archived
+        assert len(new_parent_label.children) > 0
+
+    def test_child_label_from_fixture(self, test_client, test_db, new_parent_label):
+        assert len(new_parent_label.children) > 0
+        label_a1 = new_parent_label.children[0]
         assert label_a1.title == u"Label A1"
-        assert label_a1.name == u"label-a1"
         assert label_a1.icon_emoji == u"👍"
         assert label_a1.icon == u"👍"
-
-    def test_proposal_assignment(self, test_client, test_db, new_labelset, new_proposal):
-        label_a1 = new_labelset.labels[0]
-        label_a2 = new_labelset.labels[1]
-        new_proposal.assign_label(label_a1)
-        assert label_a1 in new_proposal.labels
-
-        new_proposal.assign_label(label_a2)
-        # because labelset_a is not in radio mode,
-        # both labels will exist
-        assert label_a1 in new_proposal.labels
-        assert label_a2 in new_proposal.labels
-
-    def test_proposal_assignment_radio(self, test_client, test_db, new_labelset, new_proposal):
-        new_labelset.radio_mode = True
-        test_db.session.add(new_labelset)
-        test_db.session.commit()
-
-        label_a1 = new_labelset.labels[0]
-        label_a2 = new_labelset.labels[1]
+        assert not label_a1.is_parent
+
+    def test_label_from_fixture(self, test_client, test_db, new_label):
+        assert new_label.title == u"Label B"
+        assert new_label.icon_emoji == u"🔟"
+        assert new_label.icon == u"🔟"
+        assert not new_label.is_parent
+
+        with pytest.raises(ValueError):
+            # because Label B is not a parent label, it cannot be required
+            new_label.required = True
+
+    def test_proposal_assignment_radio(self, test_client, test_db, new_parent_label, new_proposal):
+        # Parent labels are always in radio mode
+        label_a1 = new_parent_label.children[0]
+        label_a2 = new_parent_label.children[1]
         new_proposal.assign_label(label_a1)
         assert label_a1 in new_proposal.labels
 
         new_proposal.assign_label(label_a2)
-        # because labelset_a is in radio mode,
+        # because new_parent_label is in radio mode,
         # label_a2 will replace label_a1
-        # label_a1 will not exist in ``.labels`
         assert label_a1 not in new_proposal.labels
         assert label_a2 in new_proposal.labels

From 10da32c4be199d1aa2f3a09459d5d42468e326f9 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 16 Apr 2019 16:54:18 +0530
Subject: [PATCH 034/125] fixed expression for flags

---
 funnel/models/label.py          | 20 +++++++++++++++++---
 tests/conftest.py               | 12 ++++++------
 tests/unit/models/test_label.py |  6 ++++++
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index 604c24a6f..cd8ebb465 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from sqlalchemy.sql import exists
+from sqlalchemy.sql import case, exists
 from sqlalchemy.ext.orderinglist import ordering_list
 from sqlalchemy.ext.hybrid import hybrid_property
 
@@ -90,11 +90,15 @@ def restricted(self):
 
     @restricted.setter
     def restricted(self, value):
+        if self.parent_label:
+            raise ValueError("Cannot restrict a child label")
         self._restricted = value
 
     @restricted.expression
     def restricted(cls):
-        return cls._restricted == True  # NOQA
+        return case([
+            (cls.parent_label_id != None, db.select([Label._restricted]).where(Label.id == cls.parent_label_id).as_scalar())  # NOQA
+        ], else_=cls._restricted)
 
     @hybrid_property
     def archived(self):
@@ -102,11 +106,15 @@ def archived(self):
 
     @archived.setter
     def archived(self, value):
+        if self.parent_label:
+            raise ValueError("Cannot archive a child label")
         self._archived = value
 
     @archived.expression
     def archived(cls):
-        return cls._archived == True  # NOQA
+        return case([
+            (cls.parent_label_id != None, db.select([Label._archived]).where(Label.id == cls.parent_label_id).as_scalar())  # NOQA
+        ], else_=cls._archived)
 
     @hybrid_property
     def is_parent(self):
@@ -126,6 +134,12 @@ def required(self, value):
             raise ValueError("Label without children cannot be required")
         self._required = value
 
+    @archived.expression
+    def archived(cls):
+        return case([
+            (cls.parent_label_id != None, db.select([Label._required]).where(Label.id == cls.parent_label_id).as_scalar())  # NOQA
+        ], else_=cls._required)
+
     @property
     def icon(self):
         """
diff --git a/tests/conftest.py b/tests/conftest.py
index 0af1088bb..b6808e956 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -124,13 +124,8 @@ def new_project(test_db, new_profile, new_user, new_team):
     test_db.session.commit()
     return project
 
-# Scope: function
-# These fixtures are run before every test function,
-# so that changes made to the objects they return in one test function
-# doesn't affect another test function.
-
 
-@pytest.fixture(scope='function')
+@pytest.fixture(scope='session')
 def new_parent_label(test_db, new_project):
     parent_label_a = Label(
         title=u"Parent Label A", project=new_project,
@@ -153,6 +148,11 @@ def new_parent_label(test_db, new_project):
 
     return parent_label_a
 
+# Scope: function
+# These fixtures are run before every test function,
+# so that changes made to the objects they return in one test function
+# doesn't affect another test function.
+
 
 @pytest.fixture(scope='function')
 def new_label(test_db, new_project):
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index b83679101..fae6ec9ec 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
+from funnel.models import Label
 
 
 class TestLabels(object):
@@ -43,3 +44,8 @@ def test_proposal_assignment_radio(self, test_client, test_db, new_parent_label,
         # label_a2 will replace label_a1
         assert label_a1 not in new_proposal.labels
         assert label_a2 in new_proposal.labels
+
+    def test_label_flags(self, new_parent_label, new_label):
+        restricted_labels = Label.query.filter(Label.restricted == True).all()
+        assert new_parent_label in restricted_labels
+        assert new_label not in restricted_labels

From d403b22a840ac202d690e1a90621f00f462b2de8 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 16 Apr 2019 17:24:49 +0530
Subject: [PATCH 035/125] replaced labelset views and form

---
 funnel/forms/proposal.py |  81 +++++---------------------
 funnel/views/label.py    | 123 ++++++---------------------------------
 funnel/views/proposal.py |  13 ++---
 3 files changed, 37 insertions(+), 180 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 40753464b..052dd2370 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -3,62 +3,25 @@
 from baseframe import __
 import baseframe.forms as forms
 from flask import g
-from baseframe.forms.sqlalchemy import QuerySelectField
-from ..models import Project, Profile, Label, Labelset
+from baseframe.forms.sqlalchemy import QuerySelectField, QuerySelectMultipleField
+from ..models import Project, Profile, Label
 
 __all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm',
-    'ProposalMoveForm', 'get_proposal_form', 'ProposalLabelsetBaseForm']
+    'ProposalMoveForm', 'ProposalLabelsForm']
 
 
 class TransferProposal(forms.Form):
     userid = forms.UserSelectField(__("Transfer to"), validators=[forms.validators.DataRequired()])
 
 
-class ProposalLabelsetBaseForm(forms.Form):
-    """
-    This base form provides the `set_queries()` and `populate_obj_labels` methods
-    that lets you fill a proposal form with the labels and then save them.
+class ProposalLabelsForm(forms.Form):
+    labels = QuerySelectMultipleField(__("Labels"), get_label='title', get_pk=lambda l: l.name)
 
-    Any Proposal form that needs to show labels, need to inherit this class.
-    """
     def set_queries(self):
-        if self.edit_parent is not None:
-            # Fill up the choices for the labelsets
-            for labelset in self.edit_parent.labelsets:
-                labelset_field = getattr(self, labelset.form_name)
-                labelset_field.choices = [(l.name, l.title) for l in labelset.labels]
-                if self.edit_obj is not None:
-                    # If it's an edit form, select the proper label for each labelset
-                    labels_data = set(self.edit_obj.labels).intersection(set(labelset.labels))
-                    data = labels_data.pop().name if len(labels_data) == 1 else [l.name for l in labels_data]
-                    if labelset_field.data == 'None' and data:
-                        labelset_field.data = data
-
-    def populate_obj_labels(self, proposal):
-        """
-        Assign the appropriate labels to the proposal
-        """
-        labelset_keys = [key for key in self.data.keys() if key.startswith('labelset_')]
-        for key in labelset_keys:
-            labelset = Labelset.query.filter_by(form_name=key, project=proposal.project).first()
-            if labelset.radio_mode:
-                # in case of RadioField, self.data.get(key) should be a single value
-                new_label = Label.query.filter_by(labelset=labelset, name=self.data.get(key)).first()
-                proposal.assign_label(new_label)
-            else:
-                # FIXME: Move this part inside model?
-                existing_labels = set(labelset.labels).intersection(set(proposal.labels))
-                # in case of MultiSelectField, self.data.get(key) should be a list
-                label_names = self.data.get(key)
-                new_labels = Label.query.filter(Label.labelset == labelset, Label.name.in_(label_names)).all()
-                removed_labels = existing_labels.difference(set(new_labels))
-                for rlabel in removed_labels:
-                    proposal.labels.remove(rlabel)
-                for nlabel in new_labels:
-                    proposal.assign_label(nlabel)
-
-
-class ProposalForm(ProposalLabelsetBaseForm):
+        self.labels.query = self.edit_parent.labels
+
+
+class ProposalForm(forms.Form):
     speaking = forms.RadioField(__("Are you speaking?"), coerce=int,
         choices=[(1, __(u"I will be speaking")),
                  (0, __(u"I’m proposing a topic for someone to speak on"))])
@@ -93,6 +56,8 @@ class ProposalForm(ProposalLabelsetBaseForm):
     location = forms.StringField(__("Your location"), validators=[forms.validators.DataRequired(), forms.validators.Length(max=80)],
         description=__("Your location, to help plan for your travel if required"))
 
+    labels = QuerySelectMultipleField(__("Labels"), get_label='title', get_pk=lambda l: l.name)
+
     def __init__(self, *args, **kwargs):
         super(ProposalForm, self).__init__(*args, **kwargs)
         project = kwargs.get('parent')
@@ -105,28 +70,8 @@ def __init__(self, *args, **kwargs):
         if project.proposal_part_b.get('hint'):
             self.description.description = project.proposal_part_b.get('hint')
 
-
-def get_proposal_form(base_form_class, *args, **kwargs):
-    """
-    Takes a proposal form class as base form and adds the labelset fields to it.
-    Dynamic fields can only be added to the form class and not instance. Hence this.
-    Any form that has `obj=<proposal_object>` or `parent=<proposal_parent_obj>`
-    passed to it, can be used with this function.
-    `parent` kwarg must be provided, otherwise the labelsets wont be added to the form.
-    """
-    if 'parent' in kwargs:
-        # we need parent project to be able to handle labelsets
-        project = kwargs.get('parent')
-        for labelset in project.labelsets:
-            ls_name = labelset.form_name
-            if not hasattr(base_form_class, ls_name):
-                if labelset.restricted and not set(project.current_roles).intersection({'admin', 'reviewer'}):
-                    continue
-                FieldType = forms.RadioField if labelset.radio_mode else forms.SelectMultipleField
-                validators = [forms.validators.DataRequired()] if labelset.required else []
-                setattr(base_form_class, ls_name, FieldType(labelset.title, validators=validators,
-                    choices=[], description=labelset.description))
-    return base_form_class(*args, **kwargs)
+    def set_queries(self):
+        self.labels.query = self.edit_parent.labels
 
 
 class ProposalTransitionForm(forms.Form):
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 67c5bc307..07d95eaa5 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -6,14 +6,14 @@
 from baseframe.forms import render_delete_sqla, render_form
 
 from .. import app, funnelapp, lastuser
-from ..models import Labelset, Label, db, Project, Profile
+from ..models import Label, db, Project, Profile
 from ..forms import LabelsetForm, LabelForm
 from .mixins import ProjectViewMixin
 from .decorators import legacy_redirect
 
 
-@route('/<profile>/<project>/labelsets')
-class ProjectLabelsetView(ProjectViewMixin, UrlForView, ModelView):
+@route('/<profile>/<project>/labels')
+class ProjectLabelView(ProjectViewMixin, UrlForView, ModelView):
     __decorators__ = [legacy_redirect]
 
     @route('')
@@ -26,110 +26,33 @@ def labelsets(self):
     @route('new', methods=['GET', 'POST'])
     @lastuser.requires_login
     @requires_permission('new_labelset')
-    def new_labelset(self):
-        form = LabelsetForm(model=Labelset, parent=self.obj)
-        if form.validate_on_submit():
-            labelset = Labelset(project=self.obj)
-            form.populate_obj(labelset)
-            if 'assign_labelset' in self.obj.current_access():
-                self.obj.current_access().assign_labelset(labelset)
-                db.session.commit()
-                flash(_("The labelset has been successfully created. Assign some labels to it."), 'info')
-                return redirect(self.obj.url_for('labelsets'), code=303)
-            else:
-                flash(_("You don't have permission to create a new labelset for this project"), 'danger')
-                return redirect(self.obj.url_for('labelsets'), code=303)
-        return render_form(form=form, title=_("New labelset"), submit=_("Create labelset"))
-
-
-@route('/<project>/labelsets', subdomain='<profile>')
-class FunnelProjectLabelsetView(ProjectLabelsetView):
-    pass
-
-
-ProjectLabelsetView.init_app(app)
-FunnelProjectLabelsetView.init_app(funnelapp)
-
-
-@route('/<profile>/<project>/labelsets/<labelset>')
-class LabelsetView(UrlForView, ModelView):
-    __decorators__ = [legacy_redirect]
-    model = Labelset
-    route_model_map = {'profile': 'project.profile.name', 'project': 'project.name', 'labelset': 'name'}
-
-    def loader(self, profile, project, labelset):
-        labelset = self.model.query.join(Project).join(Profile).filter(
-            Project.name == project, Profile.name == profile,
-            Labelset.name == labelset
-            ).first_or_404()
-        g.profile = labelset.project.profile
-        return labelset
-
-    @route('edit', methods=['GET', 'POST'])
-    @lastuser.requires_login
-    @requires_permission('edit_project')
-    def edit(self):
-        form = LabelsetForm(obj=self.obj, model=Labelset, parent=self.obj.parent)
-        if form.validate_on_submit():
-            form.populate_obj(self.obj)
-            db.session.commit()
-            flash(_("Your labelset has been edited"), 'info')
-            return redirect(self.obj.project.url_for('labelsets'), code=303)
-        return render_form(form=form, title=_("Edit labelset"), submit=_("Save changes"))
+    def new_label(self):
+        pass
 
-    @route('delete', methods=['GET', 'POST'])
-    @lastuser.requires_login
-    @requires_permission('edit_project')
-    def delete(self):
-        return render_delete_sqla(self.obj, db, title=_(u"Confirm delete"),
-            message=_(u"Do you really wish to delete labelset '{title}’?").format(title=self.obj.title),
-            success=_("Your labelset has been deleted"),
-            next=self.obj.project.url_for('labelsets'),
-            cancel_url=self.obj.project.url_for('labelsets'))
 
-    @route('new', methods=['GET', 'POST'])
-    @lastuser.requires_login
-    @requires_permission('new_labelset')
-    def new_label(self):
-        form = LabelForm(model=Label, parent=self.obj)
-        if form.validate_on_submit():
-            label = Label(labelset=self.obj)
-            form.populate_obj(label)
-            if 'assign_label' in self.obj.current_access():
-                self.obj.current_access().assign_label(label)
-                db.session.commit()
-                flash(_("The label has been successfully created."), 'info')
-                return redirect(self.obj.project.url_for('labelsets'), code=303)
-            else:
-                flash(_("You don't have permission to create a new label for this project"), 'danger')
-                return redirect(self.obj.project.url_for('labelsets'), code=303)
-        return render_form(form=form, title=_("New label for '{}'".format(self.obj.title)), submit=_("Create label"))
-
-
-@route('/<project>/labelset/<labelset>', subdomain='<profile>')
-class FunnelLabelsetView(LabelsetView):
+@route('/<project>/labels', subdomain='<profile>')
+class FunnelProjectLabelView(ProjectLabelView):
     pass
 
 
-LabelsetView.init_app(app)
-FunnelLabelsetView.init_app(funnelapp)
+ProjectLabelView.init_app(app)
+FunnelProjectLabelView.init_app(funnelapp)
 
 
-@route('/<profile>/<project>/labelset/<labelset>/labels/<label>')
+@route('/<profile>/<project>/labels/<label>')
 class LabelView(UrlForView, ModelView):
     __decorators__ = [lastuser.requires_login, legacy_redirect]
     model = Label
     route_model_map = {
-        'profile': 'labelset.project.profile.name', 'project': 'labelset.project.name',
-        'labelset': 'labelset.name', 'label': 'name'}
+        'profile': 'project.profile.name', 'project': 'project.name',
+        'label': 'name'}
 
-    def loader(self, profile, project, labelset, label):
+    def loader(self, profile, project, label):
         proj = Project.query.join(Profile).filter(
-            Profile.name == profile, Project.name == project
+                Profile.name == profile, Project.name == project
             ).first_or_404()
-        lset = Labelset.query.filter_by(project=proj, name=labelset).first_or_404()
-        label = self.model.query.filter_by(labelset=lset, name=label).first_or_404()
-        g.profile = label.labelset.project.profile
+        label = self.model.query.filter_by(project=proj, name=label).first_or_404()
+        g.profile = label.project.profile
         return label
 
     @route('edit', methods=['GET', 'POST'])
@@ -141,21 +64,11 @@ def edit(self):
             form.populate_obj(self.obj)
             db.session.commit()
             flash(_("Your label has been edited"), 'info')
-            return redirect(self.obj.labelset.project.url_for('labelsets'), code=303)
+            return redirect(self.obj.project.url_for('labelsets'), code=303)
         return render_form(form=form, title=_("Edit label"), submit=_("Save changes"))
 
-    @route('delete', methods=['GET', 'POST'])
-    @lastuser.requires_login
-    @requires_permission('edit_project')
-    def delete(self):
-        return render_delete_sqla(self.obj, db, title=_(u"Confirm delete"),
-            message=_(u"Do you really wish to delete label '{title}’?").format(title=self.obj.title),
-            success=_("Your label has been deleted"),
-            next=self.obj.labelset.project.url_for('labelsets'),
-            cancel_url=self.obj.labelset.project.url_for('labelsets'))
-
 
-@route('/<project>/labelset/<label>', subdomain='<profile>')
+@route('/<project>/labels/<label>', subdomain='<profile>')
 class FunnelLabelView(LabelView):
     pass
 
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index cbb79b5f7..6c92df3b9 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -4,7 +4,6 @@
 from bleach import linkify
 
 from flask import g, redirect, request, Markup, abort, flash, escape
-from sqlalchemy import or_
 from coaster.utils import make_name
 from coaster.views import ModelView, UrlChangeCheck, UrlForView, jsonp, render_with, requires_permission, route
 from coaster.auth import current_auth
@@ -12,9 +11,9 @@
 from baseframe.forms import render_form, render_delete_sqla, Form
 
 from .. import app, funnelapp, lastuser
-from ..models import db, Section, Proposal, Comment, Label, Labelset
-from ..forms import (ProposalForm, CommentForm, DeleteCommentForm, ProposalLabelsetBaseForm,
-    ProposalTransitionForm, ProposalMoveForm, get_proposal_form)
+from ..models import db, Proposal, Comment
+from ..forms import (ProposalForm, CommentForm, DeleteCommentForm,
+    ProposalTransitionForm, ProposalMoveForm, ProposalLabelsForm)
 from .mixins import ProjectViewMixin, ProposalViewMixin
 from .decorators import legacy_redirect
 
@@ -94,7 +93,7 @@ class BaseProjectProposalView(ProjectViewMixin, UrlChangeCheck, UrlForView, Mode
     @lastuser.requires_login
     @requires_permission('new-proposal')
     def new_proposal(self):
-        form = get_proposal_form(ProposalForm, model=Proposal, parent=self.obj)
+        form = ProposalForm(model=Proposal, parent=self.obj)
         if request.method == 'GET':
             form.email.data = g.user.email
             form.phone.data = g.user.phone
@@ -168,7 +167,7 @@ def json(self):
     @lastuser.requires_login
     @requires_permission('edit-proposal')
     def edit(self):
-        form = get_proposal_form(ProposalForm, obj=self.obj.formdata, model=Proposal, parent=self.obj.project)
+        form = ProposalForm(obj=self.obj.formdata, model=Proposal, parent=self.obj.project)
         if self.obj.user != g.user:
             del form.speaking
         if form.validate_on_submit():
@@ -256,7 +255,7 @@ def schedule(self):
     @lastuser.requires_login
     @requires_permission('admin')
     def edit_labels(self):
-        form = get_proposal_form(ProposalLabelsetBaseForm, obj=self.obj, parent=self.obj.project)
+        form = ProposalLabelsForm(model=Proposal, obj=self.obj, parent=self.obj.project)
         if form.validate_on_submit():
             form.populate_obj_labels(self.obj)
             db.session.commit()

From ea255bc2e9b98d07ef6410888493518e0001ca95 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 16 Apr 2019 18:14:00 +0530
Subject: [PATCH 036/125] removed labelset form

---
 funnel/forms/label.py                 | 31 ++++++++-------------------
 funnel/models/project.py              | 12 -----------
 funnel/models/proposal.py             |  4 ++--
 funnel/templates/macros.html.jinja2   |  2 +-
 funnel/templates/proposal.html.jinja2 |  2 +-
 funnel/views/label.py                 | 10 ++++-----
 6 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index c200a10a7..190bbe1b5 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -4,36 +4,23 @@
 import baseframe.forms as forms
 from .project import valid_color_re
 
-__all__ = ['LabelsetForm', 'LabelForm']
-
-
-class LabelsetForm(forms.Form):
-    title = forms.StringField(__("Name"),
-        description=__("Name of the labelset"),
-        validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
-    description = forms.MarkdownField(__("Description"), description=__("About the labelset"))
-    required = forms.BooleanField(__("Required"), default=False,
-        description=__("When required is set, this labelset must be set for a proposal (e.g. Proposal Type)."))
-    radio_mode = forms.BooleanField(__("Radio mode"), default=False,
-        description=__("When in radio mode, only one label within the labelset can be set at a time (e.g. Proposal Type)."))
-    restricted = forms.BooleanField(__("Restricted"), default=False,
-        description=__("When in restricted mode, only an admin or reviewer can set this labelset for a proposal (e.g. Proposal Status)."))
-    archived = forms.BooleanField(__("Archived"), default=False,
-        description=__("Once archived, this labelset will not be available for use in future, but the past records will be preserved."))
+__all__ = ['LabelForm']
 
 
 class LabelForm(forms.Form):
     title = forms.StringField(__("Name"), description=__("Name of the label"),
         validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
+    description = forms.MarkdownField(__("Description"), description=__("About the label"))
     bgcolor = forms.StringField(__("Label Color"),
         validators=[forms.validators.DataRequired(), forms.validators.Length(max=6)],
         description=__("RGB Color for the label. Enter without the '#'. E.g. CCCCCC."), default=u"CCCCCC")
-    archived = forms.BooleanField(__("Archived"), default=False,
-        description=__("Once archived, this label will not be available for use in future, but the past records will be preserved."))
-    # We're not going to use icon_emoji until we move to Py3
-    # icon_emoji = forms.StringField(__("Icon/Emoji"),
-    #     validators=[forms.validators.Length(max=2)],
-    #     description=__("Emoji to be used for this label for space constrained UI"))
+    icon_emoji = forms.StringField(__("Icon/Emoji"),
+        validators=[forms.validators.Length(max=2)],
+        description=__("Emoji to be used for this label for space constrained UI"))
+    required = forms.BooleanField(__("Required"), default=False,
+        description=__("When required is set, this label must be set for a proposal (e.g. Proposal Type)."))
+    restricted = forms.BooleanField(__("Restricted"), default=False,
+        description=__("When in restricted mode, only an admin or reviewer can set this label for a proposal (e.g. Proposal Status)."))
 
     def validate_bgcolor(self, field):
         if not valid_color_re.match(field.data):
diff --git a/funnel/models/project.py b/funnel/models/project.py
index d8c9600fa..e0004c3ed 100644
--- a/funnel/models/project.py
+++ b/funnel/models/project.py
@@ -429,7 +429,6 @@ def permissions(self, user, inherited=None):
                     'edit-participant',
                     'view-participant',
                     'new-participant',
-                    'new_labelset'
                 ])
             if self.review_team and user in self.review_team.users:
                 perms.update([
@@ -490,17 +489,6 @@ def roles_for(self, actor=None, anchors=()):
         roles.update(self.profile.roles_for(actor, anchors))
         return roles
 
-    @with_roles(call={'admin'})
-    def assign_labelset(self, labelset):
-        """
-        This function takes a Labelset object and links the project with it.
-        This function requires role control. Hence this function must be called
-        via ``current_access()``.
-
-        :param labelset: A Labelset instance
-        """
-        self.labelsets.append(labelset)
-
 
 Profile.listed_projects = db.relationship(
         Project, lazy='dynamic',
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index a0f9fbf50..4e2daf2a9 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -371,12 +371,12 @@ def assign_label(self, label):
         if label.parent_label is not None:
             existing_labels = set(label.parent_label.children).intersection(set(self.labels))
             if existing_labels:
-                # the labelset is in radio mode and one of it's labels are
+                # the parent label is in radio mode and one of it's labels are
                 # already assigned to this proposal. We need to
                 # remove the older label and assign given label.
                 for elabel in existing_labels:
                     self.labels.remove(elabel)
-        # labelset is not in radio mode, so we can assign label to proposal
+        # label is not in radio mode, so we can assign label to proposal
         self.labels.append(label)
 
 
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 491a95a4f..306f39814 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -179,7 +179,7 @@
                 <a href="{{ project.url_for('edit_schedule') }}" title="Edit schedule">{% trans %}Edit schedule{% endtrans %}</a>
               </li>
               <li>
-                <a href="{{ project.url_for('labelsets') }}" title="Manage labels">{% trans %}Manage labels{% endtrans %}</a>
+                <a href="{{ project.url_for('labels') }}" title="Manage labels">{% trans %}Manage labels{% endtrans %}</a>
               </li>
               <li>
                 <a href="{{ project.url_for('venues') }}" title="Manage venues">{% trans %}Manage venues{% endtrans %}</a>
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 68c892370..2310df89e 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -100,7 +100,7 @@
         </div>
         <div class="proposal-details proposal-details--right">
           {%- for label in proposal.labels %}
-            <span class="label mui--text-bold js-labels" data-bgcolor="#{{ label.bgcolor }}">{{ label.labelset.title }}: {{ label.title }}</span>
+            <span class="label mui--text-bold js-labels" data-bgcolor="#{{ label.bgcolor }}">{{ label.parent_label.title }}: {{ label.title }}</span>
           {%- endfor %}
         </div>
       </div>
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 07d95eaa5..c61cd02ca 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -7,7 +7,7 @@
 
 from .. import app, funnelapp, lastuser
 from ..models import Label, db, Project, Profile
-from ..forms import LabelsetForm, LabelForm
+from ..forms import LabelForm
 from .mixins import ProjectViewMixin
 from .decorators import legacy_redirect
 
@@ -20,12 +20,12 @@ class ProjectLabelView(ProjectViewMixin, UrlForView, ModelView):
     @render_with('labels.html.jinja2')
     @lastuser.requires_login
     @requires_permission('edit_project')
-    def labelsets(self):
-        return dict(project=self.obj, labelsets=self.obj.labelsets)
+    def labels(self):
+        return dict(project=self.obj, labels=self.obj.labels)
 
     @route('new', methods=['GET', 'POST'])
     @lastuser.requires_login
-    @requires_permission('new_labelset')
+    @requires_permission('admin')
     def new_label(self):
         pass
 
@@ -64,7 +64,7 @@ def edit(self):
             form.populate_obj(self.obj)
             db.session.commit()
             flash(_("Your label has been edited"), 'info')
-            return redirect(self.obj.project.url_for('labelsets'), code=303)
+            return redirect(self.obj.project.url_for('labels'), code=303)
         return render_form(form=form, title=_("Edit label"), submit=_("Save changes"))
 
 

From a083c63959d7389b68e008c07552f5aac2e6ac3a Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 16 Apr 2019 18:51:27 +0530
Subject: [PATCH 037/125] added missing project FK in migration

---
 funnel/forms/proposal.py                       | 8 ++++----
 funnel/templates/labels.html.jinja2            | 4 ++--
 migrations/versions/0b25df40d307_add_labels.py | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 052dd2370..73a9d9117 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -15,10 +15,10 @@ class TransferProposal(forms.Form):
 
 
 class ProposalLabelsForm(forms.Form):
-    labels = QuerySelectMultipleField(__("Labels"), get_label='title', get_pk=lambda l: l.name)
+    labels = forms.SelectMultipleField(__("Labels"))
 
     def set_queries(self):
-        self.labels.query = self.edit_parent.labels
+        self.labels.choices = [(l.name, l.title) for l in self.edit_parent.labels]
 
 
 class ProposalForm(forms.Form):
@@ -56,7 +56,7 @@ class ProposalForm(forms.Form):
     location = forms.StringField(__("Your location"), validators=[forms.validators.DataRequired(), forms.validators.Length(max=80)],
         description=__("Your location, to help plan for your travel if required"))
 
-    labels = QuerySelectMultipleField(__("Labels"), get_label='title', get_pk=lambda l: l.name)
+    labels = forms.SelectMultipleField(__("Labels"))
 
     def __init__(self, *args, **kwargs):
         super(ProposalForm, self).__init__(*args, **kwargs)
@@ -71,7 +71,7 @@ def __init__(self, *args, **kwargs):
             self.description.description = project.proposal_part_b.get('hint')
 
     def set_queries(self):
-        self.labels.query = self.edit_parent.labels
+        self.labels.choices = [(l.name, l.title) for l in self.edit_parent.labels]
 
 
 class ProposalTransitionForm(forms.Form):
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 6adde5b80..74fede4e9 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -39,7 +39,7 @@
       </div>
     {%- endfor %}
     <div class="grid__col-xs-12 grid__col-sm-4">
-      <div class="clickable-card card" data-href="{{ project.url_for('new_labelset') }}" title="New labelset">
+      <div class="clickable-card card" data-href="{{ project.url_for('new_label') }}" title="New labelset">
         <div class="card__image-wrapper">
           <div class="card__image--default card__image--new">
             <img class="card__image" src="{{ url_for('static', filename='img/card-background.png') }}" alt="new"/>
@@ -51,7 +51,7 @@
 <!--           <h4 class="mui--text-caption card__title__heading">Write, collaborate and get feedback.</h4> -->
         </div>
         <div class="card__footer">
-          <a href="{{ project.url_for('new_labelset') }}" class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" title="New labelset" data-action="New labelset">Add</a>
+          <a href="{{ project.url_for('new_label') }}" class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" title="New labelset" data-action="New labelset">Add</a>
         </div>
       </div>
     </div>
diff --git a/migrations/versions/0b25df40d307_add_labels.py b/migrations/versions/0b25df40d307_add_labels.py
index f4c6b3dbe..73fa9ff03 100644
--- a/migrations/versions/0b25df40d307_add_labels.py
+++ b/migrations/versions/0b25df40d307_add_labels.py
@@ -18,6 +18,7 @@ def upgrade():
     op.create_table('label',
         sa.Column('created_at', sa.DateTime(), nullable=False),
         sa.Column('updated_at', sa.DateTime(), nullable=False),
+        sa.Column('project_id', sa.Integer(), nullable=False),
         sa.Column('parent_label_id', sa.Integer(), nullable=False),
         sa.Column('seq', sa.Integer(), nullable=False),
         sa.Column('description', sa.UnicodeText(), nullable=False),
@@ -30,6 +31,7 @@ def upgrade():
         sa.Column('title', sa.Unicode(length=250), nullable=False),
         sa.Column('id', sa.Integer(), nullable=False),
         sa.ForeignKeyConstraint(['parent_label_id'], ['label.id'], ondelete='CASCADE'),
+        sa.ForeignKeyConstraint(['project_id'], ['project.id'], ondelete='CASCADE'),
         sa.PrimaryKeyConstraint('id'),
         sa.UniqueConstraint('parent_label_id', 'name')
     )

From a2cb4b10270e1bd535ba8a74dbd12badaf05b6b6 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Wed, 17 Apr 2019 12:03:58 +0530
Subject: [PATCH 038/125] Label form(WIP)

---
 funnel/templates/labels.html.jinja2      | 19 +++--
 funnel/templates/labels_form.html.jinja2 | 95 ++++++++++++++++++++++++
 funnel/views/label.py                    |  8 +-
 3 files changed, 110 insertions(+), 12 deletions(-)
 create mode 100644 funnel/templates/labels_form.html.jinja2

diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 74fede4e9..e3e5239f4 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -8,20 +8,20 @@
 
 {% block contentwrapper %}
   <div class="grid">
-    {%- for labelset in labelsets %}
+    {%- for label in labels %}
       <div class="grid__col-xs-12 grid__col-sm-4">
         <div class="card">
           <div class="card__header">
-            <h3>{{ labelset.title }}</h3>
-            <div class="mui--text-body2">{{ labelset.description }}</div>
+            <h3>{{ label.title }}</h3>
+            <div class="mui--text-body2">{{ label.description }}</div>
           </div>
           <div class="card__body card__body--lgtext mui--text-subhead">
             <ol class="mui-list--aligned mui-list--border">
-              {%- for label in labelset.labels %}
+              {%- for label in labels.children %}
                 <li>
                   <span class="mui--text-subhead"><strong>{{ label.title }}</strong></span>
                   <span class="mui--pull-right">
-                    <a href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}"><i class="material-icons mui--text-subhead mui--align-top left-margin">edit</i></a>
+                    <a data-href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}" id="edit-label-btn"><i class="material-icons mui--text-subhead mui--align-top left-margin">edit</i></a>
                     <a href="{{ label.url_for('delete') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-subhead mui--align-top left-margin">delete</i></a>
                   </span>
                 </li>
@@ -32,14 +32,14 @@
           </div>
           <div class="mui-divider"></div>
           <div class="card__footer">
-            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" href="{{ labelset.url_for('new_label') }}" title="{% trans %}Add label{% endtrans %}">{% trans %}Add label{% endtrans %}</a>
-            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" href="{{ labelset.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit labelset{% endtrans %}</a>
+            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-href="{{ project.url_for('new_label') }}" title="{% trans %}Add label{% endtrans %}" id="add-label-btn">{% trans %}Add label{% endtrans %}</a>
+            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" href="{{ project.url_for('edit_label') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit label{% endtrans %}</a>
           </div>
         </div>
       </div>
     {%- endfor %}
     <div class="grid__col-xs-12 grid__col-sm-4">
-      <div class="clickable-card card" data-href="{{ project.url_for('new_label') }}" title="New labelset">
+      <div class="clickable-card card" data-href="{{ project.url_for('new_label') }}" title="New label">
         <div class="card__image-wrapper">
           <div class="card__image--default card__image--new">
             <img class="card__image" src="{{ url_for('static', filename='img/card-background.png') }}" alt="new"/>
@@ -47,8 +47,7 @@
           </div>
         </div>
         <div class="card__title">
-          <h3 class="mui--text-title card__title__heading mui--text-bold">Create a new labelset</h3>
-<!--           <h4 class="mui--text-caption card__title__heading">Write, collaborate and get feedback.</h4> -->
+          <h3 class="mui--text-title card__title__heading mui--text-bold">Create a new label</h3>
         </div>
         <div class="card__footer">
           <a href="{{ project.url_for('new_label') }}" class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" title="New labelset" data-action="New labelset">Add</a>
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
new file mode 100644
index 000000000..e91e00a7a
--- /dev/null
+++ b/funnel/templates/labels_form.html.jinja2
@@ -0,0 +1,95 @@
+{% extends "formlayout.html.jinja2" %}
+{% from "baseframe/forms.html.jinja2" import renderfield, rendersubmit, ajaxform %}
+{% block title %}{{ title }}{% endblock %}
+
+{% block pageheaders %}
+{% endblock %}
+
+{% macro labelformfields(forms) %}
+  {{ renderfield(form.title, autofocus=true) }}
+  {%- for error in form.title.errors %}
+    <div><p class="mui-form__error">{{ error }}</p></div>
+  {%- endfor %}
+  {{ renderfield(form.description) }}
+  {%- for error in form.description.errors %}
+    <div><p class="mui-form__error">{{ error }}</p></div>
+  {%- endfor %}
+  {{ renderfield(form.bgcolor) }}
+  {%- for error in form.bgcolor.errors %}
+    <div><p class="mui-form__error">{{ error }}</p></div>
+  {%- endfor %}
+  {{ renderfield(form.icon_emoji) }}
+  {%- for error in form.icon_emoji.errors %}
+    <div><p class="mui-form__error">{{ error }}</p></div>
+  {%- endfor %}
+  {{ renderfield(form.required) }}
+  {%- for error in form.required.errors %}
+    <div><p class="mui-form__error">{{ error }}</p></div>
+  {%- endfor %}
+  {{ renderfield(form.restricted) }}
+  {%- for error in form.restricted.errors %}
+    <div><p class="mui-form__error">{{ error }}</p></div>
+  {%- endfor %}
+{% endmacro %}
+
+{% block content %}
+  {%- if form.errors %}
+    <div class="alert alert--error alert--dismissable">
+      <a class="alert__close" href="javascript:void(0);" aria-label="close"><i class="material-icons">clear</i></a>
+      <p class="alert__text"><i class="material-icons alert__icon">error</i>{% trans %}Please review the indicated issues{% endtrans %}</p>
+    </div>
+  {%- endif %}
+  {%- if message %}
+    <p class="form-message">{{ message }}</p>
+  {%- endif %}
+  <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins hg-form">
+    {{ form.hidden_tag() }}
+    {{ labelformfields(form) }}
+    <div id="inner-forms"></div>
+    <p><button class="mui-btn mui-btn--raised mui-btn--accent" id="add-label-btn">+ Add label</button></p>
+    <div class="mui-form form-actions clearfix">
+      <div>
+        <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary" value="reject">Submit</button>
+        <span class="loading mui--hide"></span>
+      </div>
+    </div>
+  </form>
+  <div id="child-label-form" class="modal">
+    <div class="modal__header">
+      <a class="modal__close" href="javascript:void(0);" aria-label="close" rel="modal:close"><i class="material-icons">clear</i></a>
+      <h3 class="js-modal-title session-modal__title">Add label</h3>
+    </div>
+    <hr class="mui-divider mui-divider--custom">
+    <div class="js-modal-inner">
+      <div class="mui-form mui-form--margins hg-form">
+        <div id="child-form"></div>
+        <div class="mui-form form-actions clearfix">
+          <div>
+            <button class="mui-btn mui-btn--raised mui-btn--primary" id="add-child-label">Add label</button>
+            <span class="loading mui--hide"></span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock %}
+
+{% block footerscripts %}
+  <script type="text/javascript">
+    $(function() {
+      $('#add-label-btn').click(function(event) {
+        event.preventDefault();
+        var formHtml = {{ labelformfields(form)|tojson|safe }};
+        $('#child-form').html(formHtml);
+        $('#child-label-form').modal();
+        activate_widgets();
+      });
+      $('#add-child-label').click(function(event) {
+        event.preventDefault();
+        $.modal.close();
+        $('#inner-forms').append($('#child-form').html());
+      });
+    });
+  </script>
+  <script src="{{ 'parsley.js'|ext_asset_url }}" type="text/javascript"></script>
+{% endblock %}
diff --git a/funnel/views/label.py b/funnel/views/label.py
index c61cd02ca..b52e8d2eb 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from flask import flash, redirect, g
+from flask import flash, redirect, g, render_template
 from coaster.views import render_with, requires_permission, route, UrlForView, ModelView
 from baseframe import _
 from baseframe.forms import render_delete_sqla, render_form
@@ -27,7 +27,11 @@ def labels(self):
     @lastuser.requires_login
     @requires_permission('admin')
     def new_label(self):
-        pass
+        form = LabelForm(obj=self.obj, model=Label, parent=self.obj.parent)
+        # return jsonify(
+            # title="Add label",
+            # form=render_template('labels_form.html.jinja2', title="Add label", form=form, project=self.obj))
+        return render_template('labels_form.html.jinja2', title="Add label", form=form, project=self.obj)
 
 
 @route('/<project>/labels', subdomain='<profile>')

From 49d505ae43b0488d2bb72cf420e86fdc5316c426 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Wed, 17 Apr 2019 13:35:45 +0530
Subject: [PATCH 039/125] Remove unwanted fields from sublabel form and update
 the UI

---
 funnel/static/css/app.css                | 56 ++++++++++++++----------
 funnel/static/sass/_form.scss            | 36 +++++++++++++++
 funnel/static/sass/_layout.scss          | 23 ----------
 funnel/static/sass/app.scss              |  1 +
 funnel/templates/labels_form.html.jinja2 | 31 ++++++++-----
 5 files changed, 91 insertions(+), 56 deletions(-)
 create mode 100644 funnel/static/sass/_form.scss

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 83c551a1c..8165465df 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -183,28 +183,6 @@ html.touch .collapsible__body--disable {
   margin-bottom: 10px;
 }
 
-.cfp-action-btn {
-  padding: 10px 0;
-  cursor: pointer;
-  margin-right: 10px;
-  border: none;
-  color: #4A90E2;
-  background: none;
-}
-
-.cfp-action-btn:focus,
-.cfp-action-btn:hover {
-  border: none;
-  outline: none;
-  box-shadow: none;
-  color: #4A90E2;
-}
-
-.inline-form {
-  display: inline-block;
-  vertical-align: middle;
-}
-
 .past-events-table {
   border-collapse: collapse;
 }
@@ -411,6 +389,40 @@ html.touch .collapsible__body--disable {
   text-transform: uppercase;
 }
 
+.cfp-action-btn {
+  padding: 10px 0;
+  cursor: pointer;
+  margin-right: 10px;
+  border: none;
+  color: #4A90E2;
+  background: none;
+}
+
+.cfp-action-btn:focus,
+.cfp-action-btn:hover {
+  border: none;
+  outline: none;
+  box-shadow: none;
+  color: #4A90E2;
+}
+
+.inline-form {
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.js-modal-inner .card-wrapper {
+  width: 100%;
+  padding: 0;
+}
+.js-modal-inner .card-wrapper .card {
+  box-shadow: none;
+  margin-bottom: 0;
+}
+.js-modal-inner .card-wrapper .card .card__body {
+  padding: 0;
+}
+
 .clickable-card {
   color: #1F2D3D;
   display: block;
diff --git a/funnel/static/sass/_form.scss b/funnel/static/sass/_form.scss
new file mode 100644
index 000000000..388ab912d
--- /dev/null
+++ b/funnel/static/sass/_form.scss
@@ -0,0 +1,36 @@
+.cfp-action-btn {
+  padding: 10px 0;
+  cursor: pointer;
+  margin-right: 10px; 
+  border: none;
+  color: #4A90E2;
+  background: none;
+}
+
+
+.cfp-action-btn:focus,
+.cfp-action-btn:hover {
+  border: none;
+  outline: none;
+  box-shadow: none;
+  color: #4A90E2;
+}
+
+.inline-form {
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.js-modal-inner {
+	.card-wrapper {
+		width: 100%;
+    padding: 0;
+    .card {
+      box-shadow: none;
+      margin-bottom: 0;
+      .card__body {
+        padding: 0;
+      }
+    }
+	}
+}
\ No newline at end of file
diff --git a/funnel/static/sass/_layout.scss b/funnel/static/sass/_layout.scss
index 5d58a8baa..03e594bf5 100644
--- a/funnel/static/sass/_layout.scss
+++ b/funnel/static/sass/_layout.scss
@@ -189,29 +189,6 @@ html.touch .collapsible__body--disable {
   margin-bottom: 10px;
 }
 
-.cfp-action-btn {
-  padding: 10px 0;
-  cursor: pointer;
-  margin-right: 10px; 
-  border: none;
-  color: #4A90E2;
-  background: none;
-}
-
-
-.cfp-action-btn:focus,
-.cfp-action-btn:hover {
-  border: none;
-  outline: none;
-  box-shadow: none;
-  color: #4A90E2;
-}
-
-.inline-form {
-  display: inline-block;
-  vertical-align: middle;
-}
-
 .past-events-table {
   border-collapse: collapse;
 
diff --git a/funnel/static/sass/app.scss b/funnel/static/sass/app.scss
index 8d28f192c..bf8028600 100644
--- a/funnel/static/sass/app.scss
+++ b/funnel/static/sass/app.scss
@@ -5,6 +5,7 @@
 @import "layout";
 @import "header";
 @import "home";
+@import "form";
 @import "card";
 @import "project";
 @import "proposal";
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index e91e00a7a..17b3fb27c 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -5,7 +5,8 @@
 {% block pageheaders %}
 {% endblock %}
 
-{% macro labelformfields(forms) %}
+{% macro labelformfields(forms, subform=false) %}
+  {%- if subform %}<div class="grid__col-xs-12 grid__col-sm-6 grid__col-lg-4 card-wrapper"><div class="card"><div class="card__body">{%- endif %}
   {{ renderfield(form.title, autofocus=true) }}
   {%- for error in form.title.errors %}
     <div><p class="mui-form__error">{{ error }}</p></div>
@@ -22,14 +23,17 @@
   {%- for error in form.icon_emoji.errors %}
     <div><p class="mui-form__error">{{ error }}</p></div>
   {%- endfor %}
-  {{ renderfield(form.required) }}
-  {%- for error in form.required.errors %}
-    <div><p class="mui-form__error">{{ error }}</p></div>
-  {%- endfor %}
-  {{ renderfield(form.restricted) }}
-  {%- for error in form.restricted.errors %}
-    <div><p class="mui-form__error">{{ error }}</p></div>
-  {%- endfor %}
+{%- if subform %}</div></div></div>{%- endif %}
+  {%- if not subform %}
+    {{ renderfield(form.required) }}
+    {%- for error in form.required.errors %}
+      <div><p class="mui-form__error">{{ error }}</p></div>
+    {%- endfor %}
+    {{ renderfield(form.restricted) }}
+    {%- for error in form.restricted.errors %}
+      <div><p class="mui-form__error">{{ error }}</p></div>
+    {%- endfor %}
+  {%- endif %}
 {% endmacro %}
 
 {% block content %}
@@ -45,7 +49,11 @@
   <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins hg-form">
     {{ form.hidden_tag() }}
     {{ labelformfields(form) }}
-    <div id="inner-forms"></div>
+    <div id="inner-forms" class="grid">
+      <div class="grid__col-xs-12">
+        <p class="mui--text-title mui--text-bold mui--hide subtitle">Sublabels</p>
+      </div>
+    </div>
     <p><button class="mui-btn mui-btn--raised mui-btn--accent" id="add-label-btn">+ Add label</button></p>
     <div class="mui-form form-actions clearfix">
       <div>
@@ -79,7 +87,7 @@
     $(function() {
       $('#add-label-btn').click(function(event) {
         event.preventDefault();
-        var formHtml = {{ labelformfields(form)|tojson|safe }};
+        var formHtml = {{ labelformfields(form, subform=true)|tojson|safe }};
         $('#child-form').html(formHtml);
         $('#child-label-form').modal();
         activate_widgets();
@@ -88,6 +96,7 @@
         event.preventDefault();
         $.modal.close();
         $('#inner-forms').append($('#child-form').html());
+        $('.subtitle').removeClass('mui--hide');
       });
     });
   </script>

From 5d8bd1f923c9bcb2ac349efe0b85f06646fb1d36 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Wed, 17 Apr 2019 15:08:38 +0530
Subject: [PATCH 040/125] Remove description and bgcolor

---
 funnel/forms/label.py                    |  4 ----
 funnel/templates/labels_form.html.jinja2 | 15 ++++-----------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 190bbe1b5..8f7280989 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -10,10 +10,6 @@
 class LabelForm(forms.Form):
     title = forms.StringField(__("Name"), description=__("Name of the label"),
         validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
-    description = forms.MarkdownField(__("Description"), description=__("About the label"))
-    bgcolor = forms.StringField(__("Label Color"),
-        validators=[forms.validators.DataRequired(), forms.validators.Length(max=6)],
-        description=__("RGB Color for the label. Enter without the '#'. E.g. CCCCCC."), default=u"CCCCCC")
     icon_emoji = forms.StringField(__("Icon/Emoji"),
         validators=[forms.validators.Length(max=2)],
         description=__("Emoji to be used for this label for space constrained UI"))
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index 17b3fb27c..a36929204 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -11,21 +11,13 @@
   {%- for error in form.title.errors %}
     <div><p class="mui-form__error">{{ error }}</p></div>
   {%- endfor %}
-  {{ renderfield(form.description) }}
-  {%- for error in form.description.errors %}
-    <div><p class="mui-form__error">{{ error }}</p></div>
-  {%- endfor %}
-  {{ renderfield(form.bgcolor) }}
-  {%- for error in form.bgcolor.errors %}
-    <div><p class="mui-form__error">{{ error }}</p></div>
-  {%- endfor %}
   {{ renderfield(form.icon_emoji) }}
   {%- for error in form.icon_emoji.errors %}
     <div><p class="mui-form__error">{{ error }}</p></div>
   {%- endfor %}
-{%- if subform %}</div></div></div>{%- endif %}
+  {%- if subform %}</div></div></div>{%- endif %}
   {%- if not subform %}
-    {{ renderfield(form.required) }}
+    {{ renderfield(form.required, css_class="mui--hide js-required-field") }}
     {%- for error in form.required.errors %}
       <div><p class="mui-form__error">{{ error }}</p></div>
     {%- endfor %}
@@ -96,7 +88,8 @@
         event.preventDefault();
         $.modal.close();
         $('#inner-forms').append($('#child-form').html());
-        $('.subtitle').removeClass('mui--hide');
+        $('.subtitle, .js-required-field').removeClass('mui--hide');
+        $('.js-required-field input').click();
       });
     });
   </script>

From 369c09927aae6229df56ef06653c7e7a59cfa4b5 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Wed, 17 Apr 2019 18:18:27 +0530
Subject: [PATCH 041/125] added sublabel form

---
 funnel/forms/label.py     | 11 +++++++++++
 funnel/models/proposal.py | 14 +++++++-------
 funnel/views/label.py     |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 190bbe1b5..81794a9c5 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -25,3 +25,14 @@ class LabelForm(forms.Form):
     def validate_bgcolor(self, field):
         if not valid_color_re.match(field.data):
             raise forms.ValidationError("Please enter a valid color code")
+
+
+class SublabelForm(forms.Form):
+    title = forms.StringField(__("Name"), description=__("Name of the label"),
+        validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
+    bgcolor = forms.StringField(__("Label Color"),
+        validators=[forms.validators.DataRequired(), forms.validators.Length(max=6)],
+        description=__("RGB Color for the label. Enter without the '#'. E.g. CCCCCC."), default=u"CCCCCC")
+    icon_emoji = forms.StringField(__("Icon/Emoji"),
+        validators=[forms.validators.Length(max=2)],
+        description=__("Emoji to be used for this label for space constrained UI"))
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 4e2daf2a9..413f24a6c 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from flask import abort
+from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.ext.hybrid import hybrid_property
+from werkzeug.utils import cached_property
 from . import db, TimestampMixin, UuidMixin, BaseScopedIdNameMixin, MarkdownColumn, JsonDict, CoordinatesMixin, UrlType
 from .user import User
 from .project import Project
@@ -9,10 +11,6 @@
 from coaster.utils import LabeledEnum
 from coaster.sqlalchemy import SqlSplitIdComparator, StateManager, with_roles
 from baseframe import __
-from sqlalchemy.ext.hybrid import hybrid_property
-from flask import request
-from pytz import timezone, utc, UnknownTimeZoneError
-from werkzeug.utils import cached_property
 from ..util import geonameid_from_location
 
 __all__ = ['PROPOSAL_STATE', 'Proposal', 'ProposalRedirect']
@@ -141,6 +139,9 @@ class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
     # Additional form data
     data = db.Column(JsonDict, nullable=False, server_default='{}')
 
+    # for managing relationship with labels easily
+    labels = association_proxy('labels', 'name')
+
     __table_args__ = (db.UniqueConstraint('project_id', 'url_id'),)
 
     # XXX: The following two may overlap. Reconsider whether both are needed
@@ -333,8 +334,7 @@ def permissions(self, user, inherited=None):
             perms.update([
                 'vote_proposal',
                 'new_comment',
-                'vote_comment',
-                'edit-proposal'
+                'vote_comment'
                 ])
             if user == self.owner:
                 perms.update([
diff --git a/funnel/views/label.py b/funnel/views/label.py
index b52e8d2eb..428727b71 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -27,7 +27,7 @@ def labels(self):
     @lastuser.requires_login
     @requires_permission('admin')
     def new_label(self):
-        form = LabelForm(obj=self.obj, model=Label, parent=self.obj.parent)
+        form = LabelForm(model=Label, parent=self.obj.parent)
         # return jsonify(
             # title="Add label",
             # form=render_template('labels_form.html.jinja2', title="Add label", form=form, project=self.obj))

From 5cd4341d5f656dd8a185a0d82ac7ec172dcdff13 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Wed, 17 Apr 2019 19:10:07 +0530
Subject: [PATCH 042/125] added sublabelform

---
 funnel/forms/label.py                         |  5 +--
 funnel/templates/labels.html.jinja2           | 36 +++++++++---------
 funnel/views/label.py                         | 38 ++++++++++++++++---
 .../versions/0b25df40d307_add_labels.py       |  3 +-
 4 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 8aa624c23..aa3a358b0 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -4,7 +4,7 @@
 import baseframe.forms as forms
 from .project import valid_color_re
 
-__all__ = ['LabelForm']
+__all__ = ['LabelForm', 'SublabelForm']
 
 
 class LabelForm(forms.Form):
@@ -26,9 +26,6 @@ def validate_bgcolor(self, field):
 class SublabelForm(forms.Form):
     title = forms.StringField(__("Name"), description=__("Name of the label"),
         validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
-    bgcolor = forms.StringField(__("Label Color"),
-        validators=[forms.validators.DataRequired(), forms.validators.Length(max=6)],
-        description=__("RGB Color for the label. Enter without the '#'. E.g. CCCCCC."), default=u"CCCCCC")
     icon_emoji = forms.StringField(__("Icon/Emoji"),
         validators=[forms.validators.Length(max=2)],
         description=__("Emoji to be used for this label for space constrained UI"))
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index e3e5239f4..2fa86426c 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -15,25 +15,27 @@
             <h3>{{ label.title }}</h3>
             <div class="mui--text-body2">{{ label.description }}</div>
           </div>
-          <div class="card__body card__body--lgtext mui--text-subhead">
-            <ol class="mui-list--aligned mui-list--border">
-              {%- for label in labels.children %}
-                <li>
-                  <span class="mui--text-subhead"><strong>{{ label.title }}</strong></span>
-                  <span class="mui--pull-right">
-                    <a data-href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}" id="edit-label-btn"><i class="material-icons mui--text-subhead mui--align-top left-margin">edit</i></a>
-                    <a href="{{ label.url_for('delete') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-subhead mui--align-top left-margin">delete</i></a>
-                  </span>
-                </li>
-              {% else %}
-                <li class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></li>
-              {%- endfor %}
-            </ol>
-          </div>
-          <div class="mui-divider"></div>
+          {% if label.is_parent %}
+            <div class="card__body card__body--lgtext mui--text-subhead">
+              <ol class="mui-list--aligned mui-list--border">
+                {%- for sublabel in label.children %}
+                  <li>
+                    <span class="mui--text-subhead"><strong>{{ sublabel.title }}</strong></span>
+                    <span class="mui--pull-right">
+                      <a data-href="{{ sublabel.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}" id="edit-label-btn"><i class="material-icons mui--text-subhead mui--align-top left-margin">edit</i></a>
+                      <a href="{{ sublabel.url_for('delete') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-subhead mui--align-top left-margin">delete</i></a>
+                    </span>
+                  </li>
+                {% else %}
+                  <li class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></li>
+                {%- endfor %}
+              </ol>
+            </div>
+            <div class="mui-divider"></div>
+          {% endif %}
           <div class="card__footer">
             <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-href="{{ project.url_for('new_label') }}" title="{% trans %}Add label{% endtrans %}" id="add-label-btn">{% trans %}Add label{% endtrans %}</a>
-            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" href="{{ project.url_for('edit_label') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit label{% endtrans %}</a>
+            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit label{% endtrans %}</a>
           </div>
         </div>
       </div>
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 428727b71..baf6e1e4f 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 
-from flask import flash, redirect, g, render_template
+from flask import flash, redirect, g, render_template, request
 from coaster.views import render_with, requires_permission, route, UrlForView, ModelView
 from baseframe import _
 from baseframe.forms import render_delete_sqla, render_form
 
 from .. import app, funnelapp, lastuser
 from ..models import Label, db, Project, Profile
-from ..forms import LabelForm
+from ..forms import LabelForm, SublabelForm
 from .mixins import ProjectViewMixin
 from .decorators import legacy_redirect
 
@@ -28,9 +28,37 @@ def labels(self):
     @requires_permission('admin')
     def new_label(self):
         form = LabelForm(model=Label, parent=self.obj.parent)
-        # return jsonify(
-            # title="Add label",
-            # form=render_template('labels_form.html.jinja2', title="Add label", form=form, project=self.obj))
+        if form.validate_on_submit():
+            # This form can send one or multiple values for title and icon_emoji.
+            # If the label doesn't have any sublabel, one value is sent for each list,
+            # and those values are also available at `form.data`.
+            # But in case there are sublabels, the sublabel values are in the list
+            # in the order they appeared on the create form.
+            titlelist = request.values.getlist('title')
+            emojilist = request.values.getlist('icon_emoji')
+            # first values of both lists belong to the parent label
+            titlelist.pop(0)
+            emojilist.pop(0)
+
+            label = Label(project=self.obj)
+            form.populate_obj(label)
+            self.obj.labels.append(label)
+            db.session.add(label)
+
+            for idx, title in enumerate(titlelist):
+                subform = SublabelForm(title=titlelist[idx], icon_emoji=emojilist[idx])
+                if not subform.validate():
+                    flash(_("Error with a sublabel: {}").format(subform.errors.pop()), category='error')
+                    return render_template('labels_form.html.jinja2', title="Add label", form=form, project=self.obj)
+                else:
+                    subl = Label(project=self.obj)
+                    subform.populate_obj(subl)
+                    db.session.add(subl)
+                    label.children.append(subl)
+
+            import ipdb; ipdb.set_trace()
+            db.session.commit()
+            return redirect(self.obj.url_for('labels'), code=303)
         return render_template('labels_form.html.jinja2', title="Add label", form=form, project=self.obj)
 
 
diff --git a/migrations/versions/0b25df40d307_add_labels.py b/migrations/versions/0b25df40d307_add_labels.py
index 73fa9ff03..95b531162 100644
--- a/migrations/versions/0b25df40d307_add_labels.py
+++ b/migrations/versions/0b25df40d307_add_labels.py
@@ -19,10 +19,9 @@ def upgrade():
         sa.Column('created_at', sa.DateTime(), nullable=False),
         sa.Column('updated_at', sa.DateTime(), nullable=False),
         sa.Column('project_id', sa.Integer(), nullable=False),
-        sa.Column('parent_label_id', sa.Integer(), nullable=False),
+        sa.Column('parent_label_id', sa.Integer(), nullable=True),
         sa.Column('seq', sa.Integer(), nullable=False),
         sa.Column('description', sa.UnicodeText(), nullable=False),
-        sa.Column('bgcolor', sa.Unicode(length=6), nullable=False),
         sa.Column('icon_emoji', sa.UnicodeText(), nullable=True),
         sa.Column('archived', sa.Boolean(), nullable=False),
         sa.Column('restricted', sa.Boolean(), nullable=False),

From 95b102873c052970ed0a0b7eee99f8e12946ee2c Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Thu, 18 Apr 2019 01:16:22 +0530
Subject: [PATCH 043/125] Add emoji picker

---
 funnel/__init__.py                       | 13 ++++
 funnel/forms/label.py                    |  7 +-
 funnel/static/css/app.css                | 40 ++++++++---
 funnel/static/sass/_form.scss            | 50 ++++++++++----
 funnel/templates/labels_form.html.jinja2 | 84 ++++++++++--------------
 5 files changed, 122 insertions(+), 72 deletions(-)

diff --git a/funnel/__init__.py b/funnel/__init__.py
index 1cff04e73..70ac06b0a 100644
--- a/funnel/__init__.py
+++ b/funnel/__init__.py
@@ -100,6 +100,13 @@
 app.assets.register('css_leaflet',
     Bundle(assets.require('leaflet.css', 'leaflet-search.css'),
         output='css/leaflet.packed.css', filters='cssmin'))
+app.assets.register('js_emojionearea',
+    Bundle(assets.require('!jquery.js', 'emojionearea.js'),
+        output='js/emojionearea.packed.js', filters='uglipyjs'))
+app.assets.register('css_emojionearea',
+    Bundle(assets.require('emojionearea.css'),
+        output='css/emojionearea.packed.css', filters='cssmin'))
+
 
 baseframe.init_app(funnelapp, requires=['funnel'], ext_requires=[
     'pygments', 'toastr', 'baseframe-mui'], theme='mui')
@@ -133,6 +140,12 @@
 funnelapp.assets.register('css_leaflet',
     Bundle(assets.require('leaflet.css', 'leaflet-search.css'),
         output='css/leaflet.packed.css', filters='cssmin'))
+funnelapp.assets.register('js_emojionearea',
+    Bundle(assets.require('!jquery.js', 'emojionearea.js'),
+        output='js/emojionearea.packed.js', filters='uglipyjs'))
+funnelapp.assets.register('css_emojionearea',
+    Bundle(assets.require('emojionearea.css'),
+        output='css/emojionearea.packed.css', filters='cssmin'))
 
 # FIXME: Hack for external build system generating relative /static URLs.
 # Fix this by generating absolute URLs to the static subdomain during build.
diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 8f7280989..afe6713ee 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -8,11 +8,10 @@
 
 
 class LabelForm(forms.Form):
-    title = forms.StringField(__("Name"), description=__("Name of the label"),
+    title = forms.StringField(__("Title"),
         validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
-    icon_emoji = forms.StringField(__("Icon/Emoji"),
-        validators=[forms.validators.Length(max=2)],
-        description=__("Emoji to be used for this label for space constrained UI"))
+    icon_emoji = forms.StringField(__(""),
+        validators=[forms.validators.Length(max=2)])
     required = forms.BooleanField(__("Required"), default=False,
         description=__("When required is set, this label must be set for a proposal (e.g. Proposal Type)."))
     restricted = forms.BooleanField(__("Restricted"), default=False,
diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 8165465df..2f58eea6c 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -411,16 +411,40 @@ html.touch .collapsible__body--disable {
   vertical-align: middle;
 }
 
-.js-modal-inner .card-wrapper {
-  width: 100%;
-  padding: 0;
+.label-title {
+  width: calc(100% - 90px);
+  display: inline-block;
 }
-.js-modal-inner .card-wrapper .card {
-  box-shadow: none;
-  margin-bottom: 0;
+
+.mui-form__fields.emojipicker {
+  float: left;
+  width: 70px;
+  height: 48px;
+  margin-right: 20px;
 }
-.js-modal-inner .card-wrapper .card .card__body {
-  padding: 0;
+.mui-form__fields.emojipicker .emojionearea-editor {
+  height: 48px;
+  min-height: 20px;
+  overflow: hidden;
+  white-space: nowrap;
+  position: absolute;
+  top: 0;
+  left: 12px;
+  right: 24px;
+  padding: 6px 0;
+}
+.mui-form__fields.emojipicker .emojionearea-button {
+  top: 10px;
+}
+.mui-form__fields.emojipicker .emojionearea-editor {
+  left: 6px !important;
+}
+.mui-form__fields.emojipicker .emojionearea-button .emojionearea-button-open {
+  right: 0;
+}
+
+.label-form-modal {
+  overflow: visible;
 }
 
 .clickable-card {
diff --git a/funnel/static/sass/_form.scss b/funnel/static/sass/_form.scss
index 388ab912d..8a7f5d9a7 100644
--- a/funnel/static/sass/_form.scss
+++ b/funnel/static/sass/_form.scss
@@ -21,16 +21,42 @@
   vertical-align: middle;
 }
 
-.js-modal-inner {
-	.card-wrapper {
-		width: 100%;
-    padding: 0;
-    .card {
-      box-shadow: none;
-      margin-bottom: 0;
-      .card__body {
-        padding: 0;
-      }
-    }
-	}
+.label-title {
+  width: calc(100% - 90px);
+  display: inline-block;
+}
+
+.mui-form__fields.emojipicker {
+  float: left;
+  width: 70px;
+  height: 48px;
+  margin-right: 20px;
+
+  .emojionearea-editor {
+    height: 48px;
+    min-height: 20px;
+    overflow: hidden;
+    white-space: nowrap;
+    position: absolute;
+    top: 0;
+    left: 12px;
+    right: 24px;
+    padding: 6px 0;
+  }
+
+  .emojionearea-button {
+    top: 10px;
+  }
+
+  .emojionearea-editor {
+    left: 6px !important;
+  }
+
+  .emojionearea-button .emojionearea-button-open {
+    right: 0;
+  }
+}
+
+.label-form-modal {
+  overflow: visible;
 }
\ No newline at end of file
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index a36929204..762e1da9b 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -3,29 +3,25 @@
 {% block title %}{{ title }}{% endblock %}
 
 {% block pageheaders %}
+  {% assets "css_emojionearea" -%}
+    <link rel="stylesheet" type="text/css" href="{{ ASSET_URL }}" />
+  {%- endassets -%}
 {% endblock %}
 
 {% macro labelformfields(forms, subform=false) %}
-  {%- if subform %}<div class="grid__col-xs-12 grid__col-sm-6 grid__col-lg-4 card-wrapper"><div class="card"><div class="card__body">{%- endif %}
-  {{ renderfield(form.title, autofocus=true) }}
-  {%- for error in form.title.errors %}
+  {%- if subform %}
+      <div class="card">
+          <div class="card__body">
+  {%- endif %}
+  {{ renderfield(form.icon_emoji, css_class="emojipicker") }}
+  {%- for error in form.icon_emoji.errors %}
     <div><p class="mui-form__error">{{ error }}</p></div>
   {%- endfor %}
-  {{ renderfield(form.icon_emoji) }}
-  {%- for error in form.icon_emoji.errors %}
+  {{ renderfield(form.title, autofocus=true, css_class="label-title") }}
+  {%- for error in form.title.errors %}
     <div><p class="mui-form__error">{{ error }}</p></div>
   {%- endfor %}
-  {%- if subform %}</div></div></div>{%- endif %}
-  {%- if not subform %}
-    {{ renderfield(form.required, css_class="mui--hide js-required-field") }}
-    {%- for error in form.required.errors %}
-      <div><p class="mui-form__error">{{ error }}</p></div>
-    {%- endfor %}
-    {{ renderfield(form.restricted) }}
-    {%- for error in form.restricted.errors %}
-      <div><p class="mui-form__error">{{ error }}</p></div>
-    {%- endfor %}
-  {%- endif %}
+  {%- if subform %}</div></div>{%- endif %}
 {% endmacro %}
 
 {% block content %}
@@ -41,12 +37,16 @@
   <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins hg-form">
     {{ form.hidden_tag() }}
     {{ labelformfields(form) }}
-    <div id="inner-forms" class="grid">
-      <div class="grid__col-xs-12">
-        <p class="mui--text-title mui--text-bold mui--hide subtitle">Sublabels</p>
-      </div>
-    </div>
+    <div id="child-form"></div>
     <p><button class="mui-btn mui-btn--raised mui-btn--accent" id="add-label-btn">+ Add label</button></p>
+    {{ renderfield(form.required, css_class="mui--hide js-required-field") }}
+    {%- for error in form.required.errors %}
+      <div><p class="mui-form__error">{{ error }}</p></div>
+    {%- endfor %}
+    {{ renderfield(form.restricted) }}
+    {%- for error in form.restricted.errors %}
+      <div><p class="mui-form__error">{{ error }}</p></div>
+    {%- endfor %}
     <div class="mui-form form-actions clearfix">
       <div>
         <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary" value="reject">Submit</button>
@@ -54,43 +54,31 @@
       </div>
     </div>
   </form>
-  <div id="child-label-form" class="modal">
-    <div class="modal__header">
-      <a class="modal__close" href="javascript:void(0);" aria-label="close" rel="modal:close"><i class="material-icons">clear</i></a>
-      <h3 class="js-modal-title session-modal__title">Add label</h3>
-    </div>
-    <hr class="mui-divider mui-divider--custom">
-    <div class="js-modal-inner">
-      <div class="mui-form mui-form--margins hg-form">
-        <div id="child-form"></div>
-        <div class="mui-form form-actions clearfix">
-          <div>
-            <button class="mui-btn mui-btn--raised mui-btn--primary" id="add-child-label">Add label</button>
-            <span class="loading mui--hide"></span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
 {% endblock %}
 
 {% block footerscripts %}
+  {% assets "js_emojionearea" -%}
+    <script type="text/javascript" src="{{ ASSET_URL }}"></script>
+  {%- endassets -%}
   <script type="text/javascript">
     $(function() {
+      function initEmojiPicker() {
+        $('input.field-icon_emoji:not([style*="display: none"])').emojioneArea({
+          pickerPosition: "right",
+          autocomplete: false,
+          standalone: true
+        });
+      }
       $('#add-label-btn').click(function(event) {
         event.preventDefault();
         var formHtml = {{ labelformfields(form, subform=true)|tojson|safe }};
-        $('#child-form').html(formHtml);
-        $('#child-label-form').modal();
+        $('#child-form').append(formHtml);
         activate_widgets();
+        initEmojiPicker();
+        $('.js-required-field').removeClass('mui--hide');
+        $('.js-required-field input').prop('checked', true);
       });
-      $('#add-child-label').click(function(event) {
-        event.preventDefault();
-        $.modal.close();
-        $('#inner-forms').append($('#child-form').html());
-        $('.subtitle, .js-required-field').removeClass('mui--hide');
-        $('.js-required-field input').click();
-      });
+      initEmojiPicker();
     });
   </script>
   <script src="{{ 'parsley.js'|ext_asset_url }}" type="text/javascript"></script>

From cb24ad836466780120440d1a2d5a849cd801b61b Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Thu, 18 Apr 2019 11:14:01 +0530
Subject: [PATCH 044/125] saving sublabels with emojis

---
 funnel/templates/labels.html.jinja2      |  2 +-
 funnel/templates/labels_form.html.jinja2 |  2 +-
 funnel/views/label.py                    | 14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 2fa86426c..736de67ee 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -23,7 +23,7 @@
                     <span class="mui--text-subhead"><strong>{{ sublabel.title }}</strong></span>
                     <span class="mui--pull-right">
                       <a data-href="{{ sublabel.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}" id="edit-label-btn"><i class="material-icons mui--text-subhead mui--align-top left-margin">edit</i></a>
-                      <a href="{{ sublabel.url_for('delete') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-subhead mui--align-top left-margin">delete</i></a>
+                      <a href="#" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-subhead mui--align-top left-margin">delete</i></a>
                     </span>
                   </li>
                 {% else %}
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index 762e1da9b..7fcc7ce5e 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -38,7 +38,7 @@
     {{ form.hidden_tag() }}
     {{ labelformfields(form) }}
     <div id="child-form"></div>
-    <p><button class="mui-btn mui-btn--raised mui-btn--accent" id="add-label-btn">+ Add label</button></p>
+    <p><button class="mui-btn mui-btn--raised mui-btn--accent" id="add-label-btn">+ Add Sublabel</button></p>
     {{ renderfield(form.required, css_class="mui--hide js-required-field") }}
     {%- for error in form.required.errors %}
       <div><p class="mui-form__error">{{ error }}</p></div>
diff --git a/funnel/views/label.py b/funnel/views/label.py
index baf6e1e4f..f7c71c866 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from flask import flash, redirect, g, render_template, request
+from werkzeug.datastructures import MultiDict
 from coaster.views import render_with, requires_permission, route, UrlForView, ModelView
 from baseframe import _
 from baseframe.forms import render_delete_sqla, render_form
@@ -40,23 +41,28 @@ def new_label(self):
             titlelist.pop(0)
             emojilist.pop(0)
 
-            label = Label(project=self.obj)
-            form.populate_obj(label)
+            label = Label(title=form.data.get('title'), icon_emoji=form.data.get('icon_emoji'), project=self.obj)
+            label.restricted = form.data.get('restricted')
+            label.make_name()
             self.obj.labels.append(label)
             db.session.add(label)
 
             for idx, title in enumerate(titlelist):
-                subform = SublabelForm(title=titlelist[idx], icon_emoji=emojilist[idx])
+                subform = SublabelForm(MultiDict({
+                    'csrf_token': form.csrf_token.data, 'title': titlelist[idx],
+                    'icon_emoji': emojilist[idx]
+                    }))
+
                 if not subform.validate():
                     flash(_("Error with a sublabel: {}").format(subform.errors.pop()), category='error')
                     return render_template('labels_form.html.jinja2', title="Add label", form=form, project=self.obj)
                 else:
                     subl = Label(project=self.obj)
                     subform.populate_obj(subl)
+                    subl.make_name()
                     db.session.add(subl)
                     label.children.append(subl)
 
-            import ipdb; ipdb.set_trace()
             db.session.commit()
             return redirect(self.obj.url_for('labels'), code=303)
         return render_template('labels_form.html.jinja2', title="Add label", form=form, project=self.obj)

From 6d83dfdb836de48cfb35363cef2f440383a862f8 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Thu, 18 Apr 2019 12:31:58 +0530
Subject: [PATCH 045/125] removed length validator from emoji field

---
 funnel/forms/label.py |  5 ++---
 funnel/views/label.py | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 9e24f0987..8bbf370eb 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -10,8 +10,8 @@
 class LabelForm(forms.Form):
     title = forms.StringField(__("Title"),
         validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
-    icon_emoji = forms.StringField(__(""),
-        validators=[forms.validators.Length(max=2)])
+    icon_emoji = forms.StringField(__("Icon/Emoji"),
+        description=__("Emoji to be used for this label for space constrained UI"))
     required = forms.BooleanField(__("Required"), default=False,
         description=__("When required is set, this label must be set for a proposal (e.g. Proposal Type)."))
     restricted = forms.BooleanField(__("Restricted"), default=False,
@@ -26,5 +26,4 @@ class SublabelForm(forms.Form):
     title = forms.StringField(__("Name"), description=__("Name of the label"),
         validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
     icon_emoji = forms.StringField(__("Icon/Emoji"),
-        validators=[forms.validators.Length(max=2)],
         description=__("Emoji to be used for this label for space constrained UI"))
diff --git a/funnel/views/label.py b/funnel/views/label.py
index f7c71c866..73afc06dc 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -97,7 +97,12 @@ def loader(self, profile, project, label):
     @lastuser.requires_login
     @requires_permission('edit_project')
     def edit(self):
-        form = LabelForm(obj=self.obj, model=Label, parent=self.obj.parent)
+        if self.obj.parent_label:
+            # It's a sublabel
+            form = SublabelForm(obj=self.obj, model=Label, parent=self.obj.parent)
+        else:
+            form = LabelForm(obj=self.obj, model=Label, parent=self.obj.parent)
+
         if form.validate_on_submit():
             form.populate_obj(self.obj)
             db.session.commit()
@@ -105,6 +110,12 @@ def edit(self):
             return redirect(self.obj.project.url_for('labels'), code=303)
         return render_form(form=form, title=_("Edit label"), submit=_("Save changes"))
 
+    @route('archive', methods=['POST'])
+    @lastuser.requires_login
+    @requires_permission('admin')
+    def archive(self):
+        return redirect(self.obj.project.url_for('labels'), code=303)
+
 
 @route('/<project>/labels/<label>', subdomain='<profile>')
 class FunnelLabelView(LabelView):

From 580dce1867f9004de545056a92e13f18d6bcfce0 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Thu, 18 Apr 2019 12:33:18 +0530
Subject: [PATCH 046/125] sending an empty sublabel form to template

---
 funnel/views/label.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index 73afc06dc..b5e11a374 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -29,6 +29,7 @@ def labels(self):
     @requires_permission('admin')
     def new_label(self):
         form = LabelForm(model=Label, parent=self.obj.parent)
+        emptysubform = SublabelForm(MultiDict({}))
         if form.validate_on_submit():
             # This form can send one or multiple values for title and icon_emoji.
             # If the label doesn't have any sublabel, one value is sent for each list,
@@ -65,7 +66,7 @@ def new_label(self):
 
             db.session.commit()
             return redirect(self.obj.url_for('labels'), code=303)
-        return render_template('labels_form.html.jinja2', title="Add label", form=form, project=self.obj)
+        return render_template('labels_form.html.jinja2', title="Add label", form=form, subform=emptysubform, project=self.obj)
 
 
 @route('/<project>/labels', subdomain='<profile>')

From d5e5ecc539ccdfaeeaeb948b7bc5f183bb6bcd74 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Thu, 18 Apr 2019 18:08:12 +0530
Subject: [PATCH 047/125] modified how choices are formatted

---
 funnel/forms/proposal.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 73a9d9117..fcfc3c5b4 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -18,7 +18,14 @@ class ProposalLabelsForm(forms.Form):
     labels = forms.SelectMultipleField(__("Labels"))
 
     def set_queries(self):
-        self.labels.choices = [(l.name, l.title) for l in self.edit_parent.labels]
+        choices = []
+        for l in self.edit_parent.labels:
+            if l.is_parent:
+                children = [(sl.name, sl.title) for sl in l.children]
+                choices.append((l.title, children))
+            else:
+                choices.append((l.name, l.title))
+        self.labels.choices = choices
 
 
 class ProposalForm(forms.Form):
@@ -71,7 +78,14 @@ def __init__(self, *args, **kwargs):
             self.description.description = project.proposal_part_b.get('hint')
 
     def set_queries(self):
-        self.labels.choices = [(l.name, l.title) for l in self.edit_parent.labels]
+        choices = []
+        for l in self.edit_parent.labels:
+            if l.is_parent:
+                children = [(sl.name, sl.title) for sl in l.children]
+                choices.append((l.title, children))
+            else:
+                choices.append((l.name, l.title))
+        self.labels.choices = choices
 
 
 class ProposalTransitionForm(forms.Form):

From ecb8b002abf7688088aae4f071c61453562834cb Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 19 Apr 2019 13:10:47 +0530
Subject: [PATCH 048/125] using labels_form template for label edit

---
 funnel/views/label.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index b5e11a374..0b20f8a10 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -26,6 +26,7 @@ def labels(self):
 
     @route('new', methods=['GET', 'POST'])
     @lastuser.requires_login
+    @render_with('labels_form.html.jinja2')
     @requires_permission('admin')
     def new_label(self):
         form = LabelForm(model=Label, parent=self.obj.parent)
@@ -56,7 +57,7 @@ def new_label(self):
 
                 if not subform.validate():
                     flash(_("Error with a sublabel: {}").format(subform.errors.pop()), category='error')
-                    return render_template('labels_form.html.jinja2', title="Add label", form=form, project=self.obj)
+                    return dict(title="Add label", form=form, project=self.obj)
                 else:
                     subl = Label(project=self.obj)
                     subform.populate_obj(subl)
@@ -66,7 +67,7 @@ def new_label(self):
 
             db.session.commit()
             return redirect(self.obj.url_for('labels'), code=303)
-        return render_template('labels_form.html.jinja2', title="Add label", form=form, subform=emptysubform, project=self.obj)
+        return dict(title="Add label", form=form, subform=emptysubform, project=self.obj)
 
 
 @route('/<project>/labels', subdomain='<profile>')
@@ -96,6 +97,7 @@ def loader(self, profile, project, label):
 
     @route('edit', methods=['GET', 'POST'])
     @lastuser.requires_login
+    @render_with('labels_form.html.jinja2')
     @requires_permission('edit_project')
     def edit(self):
         if self.obj.parent_label:
@@ -103,13 +105,14 @@ def edit(self):
             form = SublabelForm(obj=self.obj, model=Label, parent=self.obj.parent)
         else:
             form = LabelForm(obj=self.obj, model=Label, parent=self.obj.parent)
+        emptysubform = SublabelForm(MultiDict({}))
 
         if form.validate_on_submit():
             form.populate_obj(self.obj)
             db.session.commit()
             flash(_("Your label has been edited"), 'info')
             return redirect(self.obj.project.url_for('labels'), code=303)
-        return render_form(form=form, title=_("Edit label"), submit=_("Save changes"))
+        return dict(title="Add label", form=form, subform=emptysubform, project=self.obj.project)
 
     @route('archive', methods=['POST'])
     @lastuser.requires_login

From 2de33375c20a2e8aa094ac9e51bd832759b94116 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 19 Apr 2019 13:29:44 +0530
Subject: [PATCH 049/125] sending sublabels to label edit form

---
 funnel/templates/labels_form.html.jinja2 | 18 ++++++++++++------
 funnel/views/label.py                    | 12 ++++++++----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index 7fcc7ce5e..b5f1d2022 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -8,17 +8,17 @@
   {%- endassets -%}
 {% endblock %}
 
-{% macro labelformfields(forms, subform=false) %}
+{% macro labelformfields(lform, subform=false) %}
   {%- if subform %}
       <div class="card">
           <div class="card__body">
   {%- endif %}
-  {{ renderfield(form.icon_emoji, css_class="emojipicker") }}
-  {%- for error in form.icon_emoji.errors %}
+  {{ renderfield(lform.icon_emoji, css_class="emojipicker") }}
+  {%- for error in lform.icon_emoji.errors %}
     <div><p class="mui-form__error">{{ error }}</p></div>
   {%- endfor %}
-  {{ renderfield(form.title, autofocus=true, css_class="label-title") }}
-  {%- for error in form.title.errors %}
+  {{ renderfield(lform.title, autofocus=true, css_class="label-title") }}
+  {%- for error in lform.title.errors %}
     <div><p class="mui-form__error">{{ error }}</p></div>
   {%- endfor %}
   {%- if subform %}</div></div>{%- endif %}
@@ -37,7 +37,13 @@
   <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins hg-form">
     {{ form.hidden_tag() }}
     {{ labelformfields(form) }}
-    <div id="child-form"></div>
+    <div id="child-form">
+      {% if form.edit_obj and form.edit_obj.is_parent and subforms %}
+        {% for subform in subforms %}
+          {{ labelformfields(subform, subform=true) }}
+        {% endfor %}
+      {% endif %}
+    </div>
     <p><button class="mui-btn mui-btn--raised mui-btn--accent" id="add-label-btn">+ Add Sublabel</button></p>
     {{ renderfield(form.required, css_class="mui--hide js-required-field") }}
     {%- for error in form.required.errors %}
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 0b20f8a10..229b05df7 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -100,19 +100,23 @@ def loader(self, profile, project, label):
     @render_with('labels_form.html.jinja2')
     @requires_permission('edit_project')
     def edit(self):
+        emptysubform = SublabelForm(MultiDict({}))
+        subforms = []
         if self.obj.parent_label:
             # It's a sublabel
-            form = SublabelForm(obj=self.obj, model=Label, parent=self.obj.parent)
+            form = SublabelForm(obj=self.obj, model=Label, parent=self.obj.project)
         else:
-            form = LabelForm(obj=self.obj, model=Label, parent=self.obj.parent)
-        emptysubform = SublabelForm(MultiDict({}))
+            form = LabelForm(obj=self.obj, model=Label, parent=self.obj.project)
+            if self.obj.is_parent:
+                for subl in self.obj.children:
+                    subforms.append(SublabelForm(obj=subl, parent=self.obj.project))
 
         if form.validate_on_submit():
             form.populate_obj(self.obj)
             db.session.commit()
             flash(_("Your label has been edited"), 'info')
             return redirect(self.obj.project.url_for('labels'), code=303)
-        return dict(title="Add label", form=form, subform=emptysubform, project=self.obj.project)
+        return dict(title="Add label", form=form, subforms=subforms, subform=emptysubform, project=self.obj.project)
 
     @route('archive', methods=['POST'])
     @lastuser.requires_login

From ba2737debaa169f190682c482bff0af124309389 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 19 Apr 2019 14:05:45 +0530
Subject: [PATCH 050/125] Update the UI of manage label page

---
 funnel/forms/label.py                 |  6 ++---
 funnel/static/css/app.css             | 14 ++++++++++
 funnel/static/sass/_card.scss         | 15 +++++++++++
 funnel/templates/labels.html.jinja2   | 39 +++++++++++----------------
 funnel/templates/proposal.html.jinja2 |  2 +-
 funnel/views/label.py                 |  2 +-
 6 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 8bbf370eb..553bd705a 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -10,8 +10,7 @@
 class LabelForm(forms.Form):
     title = forms.StringField(__("Title"),
         validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
-    icon_emoji = forms.StringField(__("Icon/Emoji"),
-        description=__("Emoji to be used for this label for space constrained UI"))
+    icon_emoji = forms.StringField(__(""))
     required = forms.BooleanField(__("Required"), default=False,
         description=__("When required is set, this label must be set for a proposal (e.g. Proposal Type)."))
     restricted = forms.BooleanField(__("Restricted"), default=False,
@@ -25,5 +24,4 @@ def validate_bgcolor(self, field):
 class SublabelForm(forms.Form):
     title = forms.StringField(__("Name"), description=__("Name of the label"),
         validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
-    icon_emoji = forms.StringField(__("Icon/Emoji"),
-        description=__("Emoji to be used for this label for space constrained UI"))
+    icon_emoji = forms.StringField(__(""))
diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 2f58eea6c..7d3dfd18b 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -538,6 +538,20 @@ html.touch .collapsible__body--disable {
   transform: translate(-50%, -50%);
 }
 
+.card__body--minheight {
+  min-height: 150px;
+}
+
+.card__body--new {
+  min-height: 194px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.card__body--new .new-btn:hover {
+  text-decoration: none;
+}
+
 .profile-details {
   display: flex;
   align-items: center;
diff --git a/funnel/static/sass/_card.scss b/funnel/static/sass/_card.scss
index 839fb8fb9..d3148deac 100644
--- a/funnel/static/sass/_card.scss
+++ b/funnel/static/sass/_card.scss
@@ -97,3 +97,18 @@
   }
 }
 
+.card__body--minheight {
+  min-height: 150px;
+}
+
+.card__body--new {
+  min-height: 194px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  .new-btn:hover {
+    text-decoration: none;
+  }
+}
+
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 736de67ee..0af8a4e6b 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -11,20 +11,13 @@
     {%- for label in labels %}
       <div class="grid__col-xs-12 grid__col-sm-4">
         <div class="card">
-          <div class="card__header">
-            <h3>{{ label.title }}</h3>
-            <div class="mui--text-body2">{{ label.description }}</div>
-          </div>
           {% if label.is_parent %}
-            <div class="card__body card__body--lgtext mui--text-subhead">
-              <ol class="mui-list--aligned mui-list--border">
+            <div class="card__body card__body--minheight mui--text-subhead">
+              <h3>{{ label.icon_emoji }} {{ label.title }}</h3>
+              <ul class="mui-list--aligned mui-list--unstyled">
                 {%- for sublabel in label.children %}
                   <li>
-                    <span class="mui--text-subhead"><strong>{{ sublabel.title }}</strong></span>
-                    <span class="mui--pull-right">
-                      <a data-href="{{ sublabel.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}" id="edit-label-btn"><i class="material-icons mui--text-subhead mui--align-top left-margin">edit</i></a>
-                      <a href="#" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-subhead mui--align-top left-margin">delete</i></a>
-                    </span>
+                    <span class="mui--text-subhead"><strong>{{ sublabel.icon_emoji }} {{ sublabel.title }}</strong></span>
                   </li>
                 {% else %}
                   <li class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></li>
@@ -32,27 +25,25 @@
               </ol>
             </div>
             <div class="mui-divider"></div>
+          {% else %}
+            <div class="card__body card__body--minheight mui--text-subhead">
+              <h3>{{ label.title }}</h3>
+            </div>
+            <div class="mui-divider"></div>
           {% endif %}
           <div class="card__footer">
-            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-href="{{ project.url_for('new_label') }}" title="{% trans %}Add label{% endtrans %}" id="add-label-btn">{% trans %}Add label{% endtrans %}</a>
-            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--accent" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit label{% endtrans %}</a>
+            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit label{% endtrans %}</a>
+            <!-- <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-href="" title="{% trans %}Add label{% endtrans %}" id="add-label-btn">{% trans %}Archive{% endtrans %}</a> -->
           </div>
         </div>
       </div>
     {%- endfor %}
     <div class="grid__col-xs-12 grid__col-sm-4">
       <div class="clickable-card card" data-href="{{ project.url_for('new_label') }}" title="New label">
-        <div class="card__image-wrapper">
-          <div class="card__image--default card__image--new">
-            <img class="card__image" src="{{ url_for('static', filename='img/card-background.png') }}" alt="new"/>
-            <p class="card__image__tagline mui--text-display1">+</p>
-          </div>
-        </div>
-        <div class="card__title">
-          <h3 class="mui--text-title card__title__heading mui--text-bold">Create a new label</h3>
-        </div>
-        <div class="card__footer">
-          <a href="{{ project.url_for('new_label') }}" class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" title="New labelset" data-action="New labelset">Add</a>
+        <div class="card__body card__body--new mui--bg-accent">
+          <p class="mui--text-headline mui--text-center">
+            <a class="new-btn mui--text-dark " href="{{ project.url_for('new_label') }}" title="New labelset" data-action="New labelset"><span>+</span><br><span>Add new label</span></a>
+          </p>
         </div>
       </div>
     </div>
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 2310df89e..16bf8e1bc 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -100,7 +100,7 @@
         </div>
         <div class="proposal-details proposal-details--right">
           {%- for label in proposal.labels %}
-            <span class="label mui--text-bold js-labels" data-bgcolor="#{{ label.bgcolor }}">{{ label.parent_label.title }}: {{ label.title }}</span>
+            <span class="label mui--text-bold">{{ label.icon_emoji }} {{ label.parent_label.title }}: {{ label.title }}</span>
           {%- endfor %}
         </div>
       </div>
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 229b05df7..d15352b75 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -116,7 +116,7 @@ def edit(self):
             db.session.commit()
             flash(_("Your label has been edited"), 'info')
             return redirect(self.obj.project.url_for('labels'), code=303)
-        return dict(title="Add label", form=form, subforms=subforms, subform=emptysubform, project=self.obj.project)
+        return dict(title="Edit label", form=form, subforms=subforms, subform=emptysubform, project=self.obj.project)
 
     @route('archive', methods=['POST'])
     @lastuser.requires_login

From a8124b41bff43498d6e505362ce445ad41b04df6 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 19 Apr 2019 19:56:28 +0530
Subject: [PATCH 051/125] trying to use proxy for labelset

---
 funnel/forms/proposal.py                 | 59 +++++++++++++++---------
 funnel/models/label.py                   |  2 +-
 funnel/models/proposal.py                | 36 ++++++++++++++-
 funnel/templates/labels_form.html.jinja2 |  3 +-
 funnel/templates/proposal.html.jinja2    |  2 +-
 funnel/views/proposal.py                 |  5 +-
 6 files changed, 78 insertions(+), 29 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index fcfc3c5b4..09b915552 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -1,13 +1,44 @@
 # -*- coding: utf-8 -*-
 
+from wtforms.fields import FieldList, FormField
+from wtforms.widgets import ListWidget, CheckboxInput
 from baseframe import __
 import baseframe.forms as forms
 from flask import g
 from baseframe.forms.sqlalchemy import QuerySelectField, QuerySelectMultipleField
 from ..models import Project, Profile, Label
-
-__all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm',
-    'ProposalMoveForm', 'ProposalLabelsForm']
+from .label import SublabelForm
+
+__all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm', 'ProposalLabelsForm',
+    'ProposalMoveForm', 'get_proposal_labels_form']
+
+
+def get_proposal_labels_form(base_form_class, *args, **kwargs):
+    """
+    Takes a proposal form class as base form and adds the labelset fields to it.
+    Dynamic fields can only be added to the form class and not instance. Hence this.
+    Any form that has `obj=<proposal_object>` or `parent=<proposal_parent_obj>`
+    passed to it, can be used with this function.
+    `parent` kwarg must be provided, otherwise the labels wont be added to the form.
+    """
+    if 'parent' in kwargs or 'obj' in kwargs:
+        # we need parent project to be able to handle labelsets
+        project = kwargs.get('parent', None) or kwargs.get('obj').project
+        for label in project.labels:
+            ls_name = label.name
+            if not hasattr(base_form_class, ls_name):
+                if label.restricted and not set(project.current_roles).intersection({'admin', 'reviewer'}):
+                    continue
+                if label.is_parent:
+                    FieldType = forms.RadioField
+                    validators = [forms.validators.DataRequired()] if label.required else []
+                    setattr(base_form_class, ls_name, FieldType(label.title, validators=validators,
+                        choices=[(subl.name, subl.title) for subl in label.children], description=label.description))
+                else:
+                    FieldType = forms.BooleanField
+                    validators = [forms.validators.DataRequired()] if label.required else []
+                    setattr(base_form_class, ls_name, FieldType(label.title, validators=validators))
+    return base_form_class(*args, **kwargs)
 
 
 class TransferProposal(forms.Form):
@@ -15,17 +46,10 @@ class TransferProposal(forms.Form):
 
 
 class ProposalLabelsForm(forms.Form):
-    labels = forms.SelectMultipleField(__("Labels"))
+    labelsets = FormField(forms.Form)
 
     def set_queries(self):
-        choices = []
-        for l in self.edit_parent.labels:
-            if l.is_parent:
-                children = [(sl.name, sl.title) for sl in l.children]
-                choices.append((l.title, children))
-            else:
-                choices.append((l.name, l.title))
-        self.labels.choices = choices
+        self.labelsets.form = get_proposal_labels_form(forms.Form, obj=self.edit_obj, parent=self.edit_parent)
 
 
 class ProposalForm(forms.Form):
@@ -63,7 +87,7 @@ class ProposalForm(forms.Form):
     location = forms.StringField(__("Your location"), validators=[forms.validators.DataRequired(), forms.validators.Length(max=80)],
         description=__("Your location, to help plan for your travel if required"))
 
-    labels = forms.SelectMultipleField(__("Labels"))
+    labelsets = FormField(forms.Form)
 
     def __init__(self, *args, **kwargs):
         super(ProposalForm, self).__init__(*args, **kwargs)
@@ -78,14 +102,7 @@ def __init__(self, *args, **kwargs):
             self.description.description = project.proposal_part_b.get('hint')
 
     def set_queries(self):
-        choices = []
-        for l in self.edit_parent.labels:
-            if l.is_parent:
-                children = [(sl.name, sl.title) for sl in l.children]
-                choices.append((l.title, children))
-            else:
-                choices.append((l.name, l.title))
-        self.labels.choices = choices
+        self.labelsets.form = get_proposal_labels_form(forms.Form, obj=self.edit_obj, parent=self.edit_parent)
 
 
 class ProposalTransitionForm(forms.Form):
diff --git a/funnel/models/label.py b/funnel/models/label.py
index cd8ebb465..85641a80b 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -122,7 +122,7 @@ def is_parent(self):
 
     @is_parent.expression
     def is_parent(cls):
-        return exists().where(Label._parent_label_id == cls.id)
+        return exists().where(Label.parent_label_id == cls.id)
 
     @hybrid_property
     def required(self):
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 413f24a6c..bd7c66547 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -88,6 +88,38 @@ def __setattr__(self, attr, value):
             self.data[attr] = value
 
 
+class ProposalLabelProxyWrapper(object):
+    obj = None
+
+    def __init__(self, obj):
+        self.obj = obj
+
+    def __getattr__(self, name):
+        from .label import Label
+        if self.obj is not None:
+            parent_label = Label.query.filter(Label.is_parent == True).filter_by(name=name, project=self.obj.project).first()  # NOQA
+            existing_label = set(self.obj.labels).intersection(set(parent_label.children))
+            return existing_label.pop() if len(existing_label) > 0 else None
+
+    def __setattr__(self, name, value):
+        from .label import Label
+        if self.obj is not None:
+            parent_label = Label.query.filter(Label.is_parent == True).filter_by(name=name, project=self.obj.project).first()  # NOQA
+            label = Label.query.filter(Label.parent_label_id == parent_label.id, Label.name == value).first()
+            if label is not None:
+                self.obj.assign_label(label)
+
+
+class ProposalLabelProxy(object):
+    def __get__(self, obj, cls=None):
+        self.obj = obj
+        if obj is not None:
+            return ProposalLabelProxyWrapper(obj)
+
+    def keys(self):
+        return [pl.name for pl in self.obj.project.labels] if self.obj is not None else []
+
+
 class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
     __tablename__ = 'proposal'
 
@@ -140,7 +172,7 @@ class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
     data = db.Column(JsonDict, nullable=False, server_default='{}')
 
     # for managing relationship with labels easily
-    labels = association_proxy('labels', 'name')
+    labelsets = ProposalLabelProxy()
 
     __table_args__ = (db.UniqueConstraint('project_id', 'url_id'),)
 
@@ -334,7 +366,7 @@ def permissions(self, user, inherited=None):
             perms.update([
                 'vote_proposal',
                 'new_comment',
-                'vote_comment'
+                'vote_comment',
                 ])
             if user == self.owner:
                 perms.update([
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index b5f1d2022..408cfbf5c 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -12,6 +12,7 @@
   {%- if subform %}
       <div class="card">
           <div class="card__body">
+          {{ lform.hidden_tag() }}
   {%- endif %}
   {{ renderfield(lform.icon_emoji, css_class="emojipicker") }}
   {%- for error in lform.icon_emoji.errors %}
@@ -77,7 +78,7 @@
       }
       $('#add-label-btn').click(function(event) {
         event.preventDefault();
-        var formHtml = {{ labelformfields(form, subform=true)|tojson|safe }};
+        var formHtml = {{ labelformfields(emptysubform, subform=true)|tojson|safe }};
         $('#child-form').append(formHtml);
         activate_widgets();
         initEmojiPicker();
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 2310df89e..f90aa09c9 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -100,7 +100,7 @@
         </div>
         <div class="proposal-details proposal-details--right">
           {%- for label in proposal.labels %}
-            <span class="label mui--text-bold js-labels" data-bgcolor="#{{ label.bgcolor }}">{{ label.parent_label.title }}: {{ label.title }}</span>
+            <span class="label mui--text-bold js-labels" data-bgcolor="#{{ label.bgcolor }}">{% if label.parent_label %}{{ label.parent_label.title }}: {% endif %}{{ label.title }}</span>
           {%- endfor %}
         </div>
       </div>
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index 6c92df3b9..90f686ea7 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -12,7 +12,7 @@
 
 from .. import app, funnelapp, lastuser
 from ..models import db, Proposal, Comment
-from ..forms import (ProposalForm, CommentForm, DeleteCommentForm,
+from ..forms import (ProposalForm, CommentForm, DeleteCommentForm, get_proposal_labels_form,
     ProposalTransitionForm, ProposalMoveForm, ProposalLabelsForm)
 from .mixins import ProjectViewMixin, ProposalViewMixin
 from .decorators import legacy_redirect
@@ -172,7 +172,6 @@ def edit(self):
             del form.speaking
         if form.validate_on_submit():
             form.populate_obj(self.obj.formdata)
-            form.populate_obj_labels(self.obj)  # this is needed to assign the labels
             self.obj.name = make_name(self.obj.title)
             self.obj.edited_at = datetime.utcnow()
             db.session.commit()
@@ -257,7 +256,7 @@ def schedule(self):
     def edit_labels(self):
         form = ProposalLabelsForm(model=Proposal, obj=self.obj, parent=self.obj.project)
         if form.validate_on_submit():
-            form.populate_obj_labels(self.obj)
+            form.populate_obj(self.obj)
             db.session.commit()
             flash(_("Labels have been saved for this proposal."), 'info')
             return redirect(self.obj.url_for(), 303)

From 01d8390f4b5f41d0caa39cf09934f06dd1b68b3d Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 19 Apr 2019 19:57:24 +0530
Subject: [PATCH 052/125] saving labels

---
 funnel/views/label.py | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index 229b05df7..a73b13ced 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -67,7 +67,7 @@ def new_label(self):
 
             db.session.commit()
             return redirect(self.obj.url_for('labels'), code=303)
-        return dict(title="Add label", form=form, subform=emptysubform, project=self.obj)
+        return dict(title="Add label", form=form, emptysubform=emptysubform, project=self.obj)
 
 
 @route('/<project>/labels', subdomain='<profile>')
@@ -113,10 +113,41 @@ def edit(self):
 
         if form.validate_on_submit():
             form.populate_obj(self.obj)
+
+            idlist = request.values.getlist('id')
+            titlelist = request.values.getlist('title')
+            emojilist = request.values.getlist('icon_emoji')
+
+            idlist.pop(0)
+            titlelist.pop(0)
+            emojilist.pop(0)
+
+            for idx, title in enumerate(titlelist):
+                if idlist[idx]:
+                    # existing sublabel
+                    subl = Label.query.filter_by(project=self.obj.project, id=idlist[idx]).first()
+                    subl.title = titlelist[idx]
+                    subl.icon_emoji = emojilist[idx]
+                else:
+                    subform = SublabelForm(MultiDict({
+                        'csrf_token': form.csrf_token.data, 'title': titlelist[idx],
+                        'icon_emoji': emojilist[idx]
+                        }))
+
+                    if not subform.validate():
+                        flash(_("Error with a sublabel: {}").format(subform.errors.pop()), category='error')
+                        return dict(title="Edit label", form=form, project=self.obj.project)
+                    else:
+                        subl = Label(project=self.obj.project)
+                        subform.populate_obj(subl)
+                        subl.make_name()
+                        self.obj.project.labels.append(subl)
+                        self.obj.children.append(subl)
+                        db.session.add(subl)
+
             db.session.commit()
-            flash(_("Your label has been edited"), 'info')
             return redirect(self.obj.project.url_for('labels'), code=303)
-        return dict(title="Add label", form=form, subforms=subforms, subform=emptysubform, project=self.obj.project)
+        return dict(title="Add label", form=form, subforms=subforms, emptysubform=emptysubform, project=self.obj.project)
 
     @route('archive', methods=['POST'])
     @lastuser.requires_login

From 9c442e2316908f6508cc9af6696ceada771608dc Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Mon, 22 Apr 2019 09:06:49 +0530
Subject: [PATCH 053/125] moved keys method to wrapper

---
 funnel/models/proposal.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index bd7c66547..b986c679e 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -89,8 +89,6 @@ def __setattr__(self, attr, value):
 
 
 class ProposalLabelProxyWrapper(object):
-    obj = None
-
     def __init__(self, obj):
         self.obj = obj
 
@@ -109,16 +107,15 @@ def __setattr__(self, name, value):
             if label is not None:
                 self.obj.assign_label(label)
 
+    def keys(self):
+        return [pl.name for pl in self.obj.project.labels] if self.obj is not None else []
+
 
 class ProposalLabelProxy(object):
     def __get__(self, obj, cls=None):
-        self.obj = obj
         if obj is not None:
             return ProposalLabelProxyWrapper(obj)
 
-    def keys(self):
-        return [pl.name for pl in self.obj.project.labels] if self.obj is not None else []
-
 
 class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
     __tablename__ = 'proposal'

From 7dd982908a2eddeead821f9c13c882cbae4fdea0 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 22 Apr 2019 11:26:46 +0530
Subject: [PATCH 054/125] Rename label parent/children to main/options; fix
 archived expression

---
 funnel/forms/proposal.py                      |  2 +-
 funnel/models/label.py                        | 39 +++++++++----------
 funnel/models/project.py                      |  2 +-
 funnel/models/proposal.py                     | 12 +++---
 funnel/templates/labels.html.jinja2           |  2 +-
 funnel/templates/proposal.html.jinja2         |  2 +-
 funnel/views/label.py                         |  4 +-
 instance/testing.py                           |  2 +-
 .../versions/0b25df40d307_add_labels.py       |  6 +--
 tests/conftest.py                             | 18 ++++-----
 tests/unit/models/test_label.py               | 36 ++++++++---------
 11 files changed, 62 insertions(+), 63 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 09b915552..7cce79b74 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -33,7 +33,7 @@ def get_proposal_labels_form(base_form_class, *args, **kwargs):
                     FieldType = forms.RadioField
                     validators = [forms.validators.DataRequired()] if label.required else []
                     setattr(base_form_class, ls_name, FieldType(label.title, validators=validators,
-                        choices=[(subl.name, subl.title) for subl in label.children], description=label.description))
+                        choices=[(subl.name, subl.title) for subl in label.options], description=label.description))
                 else:
                     FieldType = forms.BooleanField
                     validators = [forms.validators.DataRequired()] if label.required else []
diff --git a/funnel/models/label.py b/funnel/models/label.py
index 85641a80b..d5fa425fc 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -26,23 +26,23 @@ class Label(BaseScopedNameMixin, db.Model):
     parent = db.synonym('project')
 
     #: Parent label's id. Do not write to this column directly, as we don't have the ability to
-    #: validate the value within the app. Always use the :attr:`parent_label` relationship.
-    parent_label_id = db.Column(
-        'parent_label_id',
+    #: validate the value within the app. Always use the :attr:`main_label` relationship.
+    main_label_id = db.Column(
+        'main_label_id',
         None,
         db.ForeignKey('label.id', ondelete='CASCADE'),
         index=True,
         nullable=True
     )
     # See https://docs.sqlalchemy.org/en/13/orm/self_referential.html
-    children = db.relationship(
+    options = db.relationship(
         'Label',
-        backref=db.backref('parent_label', remote_side='Label.id'),
+        backref=db.backref('main_label', remote_side='Label.id'),
         order_by='Label.seq',
         collection_class=ordering_list('seq', count_from=1)
     )
 
-    # TODO: Add sqlalchemy validator for `parent_label` to ensure the parent's project matches.
+    # TODO: Add sqlalchemy validator for `main_label` to ensure the parent's project matches.
     # Ideally add a SQL post-update trigger as well (code is in coaster's add_primary_relationship)
 
     #: Sequence number for this label, used in UI for ordering
@@ -86,43 +86,42 @@ class Label(BaseScopedNameMixin, db.Model):
 
     @hybrid_property
     def restricted(self):
-        return self.parent_label._restricted if self.parent_label else self._restricted
+        return self.main_label._restricted if self.main_label else self._restricted
 
     @restricted.setter
     def restricted(self, value):
-        if self.parent_label:
-            raise ValueError("Cannot restrict a child label")
+        if self.main_label:
+            raise ValueError("This flag must be set on the parent")
         self._restricted = value
 
     @restricted.expression
     def restricted(cls):
         return case([
-            (cls.parent_label_id != None, db.select([Label._restricted]).where(Label.id == cls.parent_label_id).as_scalar())  # NOQA
+            (cls.main_label_id != None, db.select([Label._restricted]).where(Label.id == cls.main_label_id).as_scalar())  # NOQA
         ], else_=cls._restricted)
 
     @hybrid_property
     def archived(self):
-        return self._archived or self.parent_label._archived if self.parent_label else False
+        return self._archived or self.main_label._archived if self.main_label else False
 
     @archived.setter
     def archived(self, value):
-        if self.parent_label:
-            raise ValueError("Cannot archive a child label")
         self._archived = value
 
     @archived.expression
     def archived(cls):
         return case([
-            (cls.parent_label_id != None, db.select([Label._archived]).where(Label.id == cls.parent_label_id).as_scalar())  # NOQA
+            (cls._archived == True, cls._archived),  # NOQA
+            (cls.main_label_id != None, db.select([Label._archived]).where(Label.id == cls.main_label_id).as_scalar())  # NOQA
         ], else_=cls._archived)
 
     @hybrid_property
     def is_parent(self):
-        return len(self.children) != 0
+        return len(self.options) != 0
 
     @is_parent.expression
     def is_parent(cls):
-        return exists().where(Label.parent_label_id == cls.id)
+        return exists().where(Label.main_label_id == cls.id)
 
     @hybrid_property
     def required(self):
@@ -131,13 +130,13 @@ def required(self):
     @required.setter
     def required(self, value):
         if value and not self.is_parent:
-            raise ValueError("Label without children cannot be required")
+            raise ValueError("Labels without options cannot be mandatory")
         self._required = value
 
     @archived.expression
     def archived(cls):
         return case([
-            (cls.parent_label_id != None, db.select([Label._required]).where(Label.id == cls.parent_label_id).as_scalar())  # NOQA
+            (cls.main_label_id != None, db.select([Label._required]).where(Label.id == cls.main_label_id).as_scalar())  # NOQA
         ], else_=cls._required)
 
     @property
@@ -156,8 +155,8 @@ def icon(self):
         return result
 
     def __repr__(self):
-        if self.parent_label:
-            return "<Label %s/%s>" % (self.parent_label.name, self.name)
+        if self.main_label:
+            return "<Label %s/%s>" % (self.main_label.name, self.name)
         else:
             return "<Label %s>" % self.name
 
diff --git a/funnel/models/project.py b/funnel/models/project.py
index e0004c3ed..7c350232f 100644
--- a/funnel/models/project.py
+++ b/funnel/models/project.py
@@ -133,7 +133,7 @@ class Project(UuidMixin, BaseScopedNameMixin, db.Model):
     venues = db.relationship('Venue', cascade='all, delete-orphan',
         order_by='Venue.seq', collection_class=ordering_list('seq', count_from=1))
     labels = db.relationship('Label', cascade='all, delete-orphan',
-        primaryjoin='and_(Label.project_id == Project.id, Label.parent_label_id == None)',
+        primaryjoin='and_(Label.project_id == Project.id, Label.main_label_id == None)',
         order_by='Label.seq', collection_class=ordering_list('seq', count_from=1))
     all_labels = db.relationship('Label', lazy='dynamic')
 
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index b986c679e..2dc6b2cf9 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -95,15 +95,15 @@ def __init__(self, obj):
     def __getattr__(self, name):
         from .label import Label
         if self.obj is not None:
-            parent_label = Label.query.filter(Label.is_parent == True).filter_by(name=name, project=self.obj.project).first()  # NOQA
-            existing_label = set(self.obj.labels).intersection(set(parent_label.children))
+            main_label = Label.query.filter(Label.is_parent == True).filter_by(name=name, project=self.obj.project).first()  # NOQA
+            existing_label = set(self.obj.labels).intersection(set(main_label.options))
             return existing_label.pop() if len(existing_label) > 0 else None
 
     def __setattr__(self, name, value):
         from .label import Label
         if self.obj is not None:
-            parent_label = Label.query.filter(Label.is_parent == True).filter_by(name=name, project=self.obj.project).first()  # NOQA
-            label = Label.query.filter(Label.parent_label_id == parent_label.id, Label.name == value).first()
+            main_label = Label.query.filter(Label.is_parent == True).filter_by(name=name, project=self.obj.project).first()  # NOQA
+            label = Label.query.filter(Label.main_label_id == main_label.id, Label.name == value).first()
             if label is not None:
                 self.obj.assign_label(label)
 
@@ -397,8 +397,8 @@ def assign_label(self, label):
         if label.is_parent:
             raise ValueError("Parent labels cannot be assigned to a proposal")
 
-        if label.parent_label is not None:
-            existing_labels = set(label.parent_label.children).intersection(set(self.labels))
+        if label.main_label is not None:
+            existing_labels = set(label.main_label.options).intersection(set(self.labels))
             if existing_labels:
                 # the parent label is in radio mode and one of it's labels are
                 # already assigned to this proposal. We need to
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 0af8a4e6b..e6974dec2 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -15,7 +15,7 @@
             <div class="card__body card__body--minheight mui--text-subhead">
               <h3>{{ label.icon_emoji }} {{ label.title }}</h3>
               <ul class="mui-list--aligned mui-list--unstyled">
-                {%- for sublabel in label.children %}
+                {%- for sublabel in label.options %}
                   <li>
                     <span class="mui--text-subhead"><strong>{{ sublabel.icon_emoji }} {{ sublabel.title }}</strong></span>
                   </li>
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 5a38ec48a..7d1360a77 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -100,7 +100,7 @@
         </div>
         <div class="proposal-details proposal-details--right">
           {%- for label in proposal.labels %}
-            <span class="label mui--text-bold">{{ label.icon_emoji }} {% if label.parent_label %}{{ label.parent_label.title }}: {% endif %}{{ label.title }}</span>
+            <span class="label mui--text-bold">{{ label.icon_emoji }} {% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
           {%- endfor %}
         </div>
       </div>
diff --git a/funnel/views/label.py b/funnel/views/label.py
index e0521a54b..ea63e1c5d 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -63,7 +63,7 @@ def new_label(self):
                     subform.populate_obj(subl)
                     subl.make_name()
                     db.session.add(subl)
-                    label.children.append(subl)
+                    label.options.append(subl)
 
             db.session.commit()
             return redirect(self.obj.url_for('labels'), code=303)
@@ -102,7 +102,7 @@ def loader(self, profile, project, label):
     def edit(self):
         emptysubform = SublabelForm(MultiDict({}))
         subforms = []
-        if self.obj.parent_label:
+        if self.obj.main_label:
             # It's a sublabel
             form = SublabelForm(obj=self.obj, model=Label, parent=self.obj.project)
         else:
diff --git a/instance/testing.py b/instance/testing.py
index fc9114317..b7ea3481c 100644
--- a/instance/testing.py
+++ b/instance/testing.py
@@ -1,5 +1,5 @@
 SECRET_KEY = 'testkey'
-SQLALCHEMY_DATABASE_URI = 'postgresql://127.0.0.1/funnel_testing'
+SQLALCHEMY_DATABASE_URI = 'postgresql:///funnel_testing'
 SERVER_NAME = 'funnel.travis.local:3000'
 STATIC_SUBDOMAIN = 'static'
 LASTUSER_SERVER = 'https://auth.hasgeek.com'
diff --git a/migrations/versions/0b25df40d307_add_labels.py b/migrations/versions/0b25df40d307_add_labels.py
index 95b531162..8a3abd8ef 100644
--- a/migrations/versions/0b25df40d307_add_labels.py
+++ b/migrations/versions/0b25df40d307_add_labels.py
@@ -19,7 +19,7 @@ def upgrade():
         sa.Column('created_at', sa.DateTime(), nullable=False),
         sa.Column('updated_at', sa.DateTime(), nullable=False),
         sa.Column('project_id', sa.Integer(), nullable=False),
-        sa.Column('parent_label_id', sa.Integer(), nullable=True),
+        sa.Column('main_label_id', sa.Integer(), nullable=True),
         sa.Column('seq', sa.Integer(), nullable=False),
         sa.Column('description', sa.UnicodeText(), nullable=False),
         sa.Column('icon_emoji', sa.UnicodeText(), nullable=True),
@@ -29,10 +29,10 @@ def upgrade():
         sa.Column('name', sa.Unicode(length=250), nullable=False),
         sa.Column('title', sa.Unicode(length=250), nullable=False),
         sa.Column('id', sa.Integer(), nullable=False),
-        sa.ForeignKeyConstraint(['parent_label_id'], ['label.id'], ondelete='CASCADE'),
+        sa.ForeignKeyConstraint(['main_label_id'], ['label.id'], ondelete='CASCADE'),
         sa.ForeignKeyConstraint(['project_id'], ['project.id'], ondelete='CASCADE'),
         sa.PrimaryKeyConstraint('id'),
-        sa.UniqueConstraint('parent_label_id', 'name')
+        sa.UniqueConstraint('main_label_id', 'name')
     )
     op.create_table('proposal_label',
         sa.Column('proposal_id', sa.Integer(), nullable=False),
diff --git a/tests/conftest.py b/tests/conftest.py
index b6808e956..68b79886d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -126,13 +126,13 @@ def new_project(test_db, new_profile, new_user, new_team):
 
 
 @pytest.fixture(scope='session')
-def new_parent_label(test_db, new_project):
-    parent_label_a = Label(
+def new_main_label(test_db, new_project):
+    main_label_a = Label(
         title=u"Parent Label A", project=new_project,
         description=u"A test parent label"
     )
-    new_project.labels.append(parent_label_a)
-    test_db.session.add(parent_label_a)
+    new_project.labels.append(main_label_a)
+    test_db.session.add(main_label_a)
 
     label_a1 = Label(title=u"Label A1", icon_emoji=u"👍", project=new_project)
     test_db.session.add(label_a1)
@@ -140,13 +140,13 @@ def new_parent_label(test_db, new_project):
     label_a2 = Label(title=u"Label A2", project=new_project)
     test_db.session.add(label_a2)
 
-    parent_label_a.children.append(label_a1)
-    parent_label_a.children.append(label_a2)
-    parent_label_a.required = True
-    parent_label_a.restricted = True
+    main_label_a.options.append(label_a1)
+    main_label_a.options.append(label_a2)
+    main_label_a.required = True
+    main_label_a.restricted = True
     test_db.session.commit()
 
-    return parent_label_a
+    return main_label_a
 
 # Scope: function
 # These fixtures are run before every test function,
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index fae6ec9ec..1bc1f4cba 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -5,18 +5,18 @@
 
 
 class TestLabels(object):
-    def test_parent_label_from_fixture(self, test_client, new_parent_label):
-        assert new_parent_label.title == u"Parent Label A"
-        assert new_parent_label.seq == 1
-        assert new_parent_label.is_parent
-        assert new_parent_label.required
-        assert new_parent_label.restricted
-        assert not new_parent_label.archived
-        assert len(new_parent_label.children) > 0
-
-    def test_child_label_from_fixture(self, test_client, test_db, new_parent_label):
-        assert len(new_parent_label.children) > 0
-        label_a1 = new_parent_label.children[0]
+    def test_main_label_from_fixture(self, test_client, new_main_label):
+        assert new_main_label.title == u"Parent Label A"
+        assert new_main_label.seq == 1
+        assert new_main_label.is_parent
+        assert new_main_label.required
+        assert new_main_label.restricted
+        assert not new_main_label.archived
+        assert len(new_main_label.options) > 0
+
+    def test_child_label_from_fixture(self, test_client, test_db, new_main_label):
+        assert len(new_main_label.options) > 0
+        label_a1 = new_main_label.options[0]
         assert label_a1.title == u"Label A1"
         assert label_a1.icon_emoji == u"👍"
         assert label_a1.icon == u"👍"
@@ -32,20 +32,20 @@ def test_label_from_fixture(self, test_client, test_db, new_label):
             # because Label B is not a parent label, it cannot be required
             new_label.required = True
 
-    def test_proposal_assignment_radio(self, test_client, test_db, new_parent_label, new_proposal):
+    def test_proposal_assignment_radio(self, test_client, test_db, new_main_label, new_proposal):
         # Parent labels are always in radio mode
-        label_a1 = new_parent_label.children[0]
-        label_a2 = new_parent_label.children[1]
+        label_a1 = new_main_label.options[0]
+        label_a2 = new_main_label.options[1]
         new_proposal.assign_label(label_a1)
         assert label_a1 in new_proposal.labels
 
         new_proposal.assign_label(label_a2)
-        # because new_parent_label is in radio mode,
+        # because new_main_label is in radio mode,
         # label_a2 will replace label_a1
         assert label_a1 not in new_proposal.labels
         assert label_a2 in new_proposal.labels
 
-    def test_label_flags(self, new_parent_label, new_label):
+    def test_label_flags(self, new_main_label, new_label):
         restricted_labels = Label.query.filter(Label.restricted == True).all()
-        assert new_parent_label in restricted_labels
+        assert new_main_label in restricted_labels
         assert new_label not in restricted_labels

From 0563c562b7f25a0cde13cdbc25a10fc57d316119 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 22 Apr 2019 12:07:53 +0530
Subject: [PATCH 055/125] Uncommitted file in label main/options commit

---
 funnel/views/label.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index ea63e1c5d..48a6e7cc2 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -108,7 +108,7 @@ def edit(self):
         else:
             form = LabelForm(obj=self.obj, model=Label, parent=self.obj.project)
             if self.obj.is_parent:
-                for subl in self.obj.children:
+                for subl in self.obj.options:
                     subforms.append(SublabelForm(obj=subl, parent=self.obj.project))
 
         if form.validate_on_submit():
@@ -142,7 +142,7 @@ def edit(self):
                         subform.populate_obj(subl)
                         subl.make_name()
                         self.obj.project.labels.append(subl)
-                        self.obj.children.append(subl)
+                        self.obj.options.append(subl)
                         db.session.add(subl)
 
             db.session.commit()

From 6350ae2fc52c4fd0bed3654926bf31c3b1bb604b Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Mon, 22 Apr 2019 13:12:31 +0530
Subject: [PATCH 056/125] added migration for old labels

That includes moving sections, technical level and session type fields to labels
---
 .../e2be4ab896d3_migrate_old_labels.py        | 148 ++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 migrations/versions/e2be4ab896d3_migrate_old_labels.py

diff --git a/migrations/versions/e2be4ab896d3_migrate_old_labels.py b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
new file mode 100644
index 000000000..ac7144d5e
--- /dev/null
+++ b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
@@ -0,0 +1,148 @@
+"""migrate old labels
+
+Revision ID: e2be4ab896d3
+Revises: 0b25df40d307
+Create Date: 2019-04-22 12:50:31.062089
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'e2be4ab896d3'
+down_revision = '0b25df40d307'
+
+from datetime import datetime
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.sql import table, column
+
+
+proposal = table('proposal',
+    column('id', sa.Integer()),
+    column('project_id', sa.Integer()),
+    column('technical_level', sa.Unicode(40)),
+    column('session_type', sa.Unicode(40)),
+    column('section_id', sa.Integer()),
+    )
+
+project = table('project',
+    column('id', sa.Integer()),
+    column('name', sa.Unicode(250))
+    )
+
+section = table('section',
+    column('id', sa.Integer()),
+    column('project_id', sa.Integer()),
+    column('name', sa.Unicode(250)),
+    column('title', sa.Unicode(250)),
+    column('description', sa.UnicodeText()),
+    column('created_at', sa.DateTime()),
+    column('updated_at', sa.DateTime())
+    )
+
+label = table('label',
+    column('id', sa.Integer()),
+    column('name', sa.Unicode(250)),
+    column('title', sa.Unicode(250)),
+    column('description', sa.UnicodeText()),
+    column('icon_emoji', sa.UnicodeText()),
+    column('project_id', sa.Integer()),
+    column('main_label_id', sa.Integer()),
+    column('seq', sa.Integer()),
+    column('restricted', sa.Boolean()),
+    column('required', sa.Boolean()),
+    column('archived', sa.Boolean()),
+    column('created_at', sa.DateTime()),
+    column('updated_at', sa.DateTime())
+    )
+
+proposal_label = table('proposal_label',
+    column('proposal_id', sa.Integer()),
+    column('label_id', sa.Integer()),
+    column('created_at', sa.DateTime())
+    )
+
+
+def upgrade():
+    conn = op.get_bind()
+    # Migrate sections -
+    projects = conn.execute(project.select())
+    for proj in projects:
+        sec_count = conn.scalar(
+                sa.select([sa.func.count('*')]).select_from(section).where(section.c.project_id == proj['id'])
+            )
+        if sec_count > 0:
+            # the project has some sections
+            # create section labelset for the project
+            labset = conn.execute(label.insert().values({
+                    'project_id': proj['id'], 'name': u"section", 'title': u"Section",
+                    'seq': 1, 'description': u"", 'restricted': True, 'archived': False,
+                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+                }).returning(label.c.id)).first()
+
+            sections = conn.execute(section.select().where(section.c.project_id == proj['id']))
+            for index, sec in enumerate(sections, start=1):
+                lab = conn.execute(label.insert().values({
+                    'project_id': proj['id'], 'name': sec['name'], 'title': sec['title'],
+                    'seq': index, 'description': u"", 'restricted': True, 'archived': False,
+                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+                }).returning(label.c.id, label.c.name)).first()
+
+                proposals = conn.execute(
+                        proposal.select().where(proposal.c.section_id == sec['id']).where(proposal.c.project_id == sec['project_id'])
+                    )
+                for prop in proposals:
+                    pl = conn.execute(proposal_label.insert().values({
+                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
+                    }))
+
+        # technical level
+        labset = conn.execute(label.insert().values({
+            'project_id': proj['id'], 'name': u"technical-level", 'title': u"Technical Level",
+            'seq': 1, 'description': u"", 'restricted': True, 'archived': False,
+            'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+        }).returning(label.c.id)).first()
+        tl_list = [('beginner', "Beginner"), ('intermediate', "Intermediate"), ('advanced', "Advanced")]
+        for index, tl in enumerate(tl_list):
+            tl_name, tl_title = tl
+            lab = conn.execute(label.insert().values({
+                    'project_id': proj['id'], 'name': tl_name, 'title': tl_title, 'main_label_id': labset[0],
+                    'seq': index, 'description': u"", 'restricted': True, 'archived': False,
+                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+                }).returning(label.c.id, label.c.name)).first()
+
+            proposals = conn.execute(
+                    proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.technical_level == tl_title)
+                )
+            for prop in proposals:
+                pl = conn.execute(proposal_label.insert().values({
+                    'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
+                }))
+
+        # session type
+        labset = conn.execute(label.insert().values({
+                'project_id': proj['id'], 'name': u"session-type", 'title': u"Session Type",
+                'seq': 1, 'description': u"", 'restricted': True, 'archived': False,
+                'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+            }).returning(label.c.id)).first()
+        st_list = [('lecture', "Lecture"), ('demo', "Demo"), ('tutorial', "Tutorial"), ('workshop', "Workshop"), ('discussion', "Discussion"), ('panel', "Panel")]
+        for index, st in enumerate(st_list):
+            st_name, st_title = st
+            lab = conn.execute(label.insert().values({
+                    'project_id': proj['id'], 'name': st_name, 'title': st_title, 'main_label_id': labset[0],
+                    'seq': index, 'description': u"", 'restricted': True, 'archived': False,
+                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+                }).returning(label.c.id, label.c.name)).first()
+
+            proposals = conn.execute(
+                    proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.session_type == st_title)
+                )
+            for prop in proposals:
+                conn.execute(proposal_label.insert().values({
+                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
+                    }))
+
+
+def downgrade():
+    conn = op.get_bind()
+    conn.execute(label.delete())
+    conn.execute(proposal_label.delete())

From 82c82361975192f7bb8ad8a0510eed84f02ee7de Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 22 Apr 2019 13:31:50 +0530
Subject: [PATCH 057/125] Fixed proposal label form

---
 funnel/forms/proposal.py                 | 56 +++++++---------
 funnel/models/label.py                   | 84 ++++++++++++++++++++++--
 funnel/models/project.py                 |  2 +-
 funnel/models/proposal.py                | 36 +---------
 funnel/templates/labels.html.jinja2      |  2 +-
 funnel/templates/labels_form.html.jinja2 |  2 +-
 funnel/views/label.py                    |  2 +-
 funnel/views/proposal.py                 | 11 ++--
 tests/unit/models/test_label.py          |  6 +-
 9 files changed, 114 insertions(+), 87 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 7cce79b74..1a95ee8d8 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -1,44 +1,32 @@
 # -*- coding: utf-8 -*-
 
-from wtforms.fields import FieldList, FormField
-from wtforms.widgets import ListWidget, CheckboxInput
 from baseframe import __
 import baseframe.forms as forms
 from flask import g
-from baseframe.forms.sqlalchemy import QuerySelectField, QuerySelectMultipleField
-from ..models import Project, Profile, Label
-from .label import SublabelForm
+from baseframe.forms.sqlalchemy import QuerySelectField
+from ..models import Project, Profile
 
 __all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm', 'ProposalLabelsForm',
-    'ProposalMoveForm', 'get_proposal_labels_form']
+    'ProposalMoveForm']
 
 
-def get_proposal_labels_form(base_form_class, *args, **kwargs):
+def proposal_labels_form(project, proposal):
     """
-    Takes a proposal form class as base form and adds the labelset fields to it.
-    Dynamic fields can only be added to the form class and not instance. Hence this.
-    Any form that has `obj=<proposal_object>` or `parent=<proposal_parent_obj>`
-    passed to it, can be used with this function.
-    `parent` kwarg must be provided, otherwise the labels wont be added to the form.
+    Returns a label form for the given project and proposal.
     """
-    if 'parent' in kwargs or 'obj' in kwargs:
-        # we need parent project to be able to handle labelsets
-        project = kwargs.get('parent', None) or kwargs.get('obj').project
-        for label in project.labels:
-            ls_name = label.name
-            if not hasattr(base_form_class, ls_name):
-                if label.restricted and not set(project.current_roles).intersection({'admin', 'reviewer'}):
-                    continue
-                if label.is_parent:
-                    FieldType = forms.RadioField
-                    validators = [forms.validators.DataRequired()] if label.required else []
-                    setattr(base_form_class, ls_name, FieldType(label.title, validators=validators,
-                        choices=[(subl.name, subl.title) for subl in label.options], description=label.description))
-                else:
-                    FieldType = forms.BooleanField
-                    validators = [forms.validators.DataRequired()] if label.required else []
-                    setattr(base_form_class, ls_name, FieldType(label.title, validators=validators))
-    return base_form_class(*args, **kwargs)
+    class ProposalLabelForm(forms.Form):
+        pass
+
+    for label in project.labels:
+        if label.is_main and not label.archived and not label.restricted:
+            setattr(ProposalLabelForm, label.name, forms.RadioField(
+                label.title,
+                description=label.description,
+                validators=[forms.validators.DataRequired()] if label.required else [],
+                choices=[(option.name, option.title) for option in label.options]
+            ))
+
+    return ProposalLabelForm(obj=proposal.formlabels if proposal else None)
 
 
 class TransferProposal(forms.Form):
@@ -46,10 +34,10 @@ class TransferProposal(forms.Form):
 
 
 class ProposalLabelsForm(forms.Form):
-    labelsets = FormField(forms.Form)
+    formlabels = forms.FormField(forms.Form, __("Labels"))
 
     def set_queries(self):
-        self.labelsets.form = get_proposal_labels_form(forms.Form, obj=self.edit_obj, parent=self.edit_parent)
+        self.formlabels.form = proposal_labels_form(project=self.edit_parent, proposal=self.edit_obj)
 
 
 class ProposalForm(forms.Form):
@@ -87,7 +75,7 @@ class ProposalForm(forms.Form):
     location = forms.StringField(__("Your location"), validators=[forms.validators.DataRequired(), forms.validators.Length(max=80)],
         description=__("Your location, to help plan for your travel if required"))
 
-    labelsets = FormField(forms.Form)
+    formlabels = forms.FormField(forms.Form, __("Labels"))
 
     def __init__(self, *args, **kwargs):
         super(ProposalForm, self).__init__(*args, **kwargs)
@@ -102,7 +90,7 @@ def __init__(self, *args, **kwargs):
             self.description.description = project.proposal_part_b.get('hint')
 
     def set_queries(self):
-        self.labelsets.form = get_proposal_labels_form(forms.Form, obj=self.edit_obj, parent=self.edit_parent)
+        self.formlabels.form = proposal_labels_form(project=self.edit_parent, proposal=self.edit_obj)
 
 
 class ProposalTransitionForm(forms.Form):
diff --git a/funnel/models/label.py b/funnel/models/label.py
index d5fa425fc..0b7f6d2d9 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -71,7 +71,7 @@ class Label(BaseScopedNameMixin, db.Model):
     _archived = db.Column('archived', db.Boolean, nullable=False, default=False)
 
     #: Proposals that this label is attached to
-    proposals = db.relationship(Proposal, secondary=proposal_label, lazy='dynamic', backref='labels')
+    proposals = db.relationship(Proposal, secondary=proposal_label, backref='labels')
 
     __table_args__ = (db.UniqueConstraint('project_id', 'name'),)
 
@@ -116,20 +116,20 @@ def archived(cls):
         ], else_=cls._archived)
 
     @hybrid_property
-    def is_parent(self):
+    def is_main(self):
         return len(self.options) != 0
 
-    @is_parent.expression
-    def is_parent(cls):
+    @is_main.expression
+    def is_main(cls):
         return exists().where(Label.main_label_id == cls.id)
 
     @hybrid_property
     def required(self):
-        return self._required if self.is_parent else False
+        return self._required if self.is_main else False
 
     @required.setter
     def required(self, value):
-        if value and not self.is_parent:
+        if value and not self.is_main:
             raise ValueError("Labels without options cannot be mandatory")
         self._required = value
 
@@ -164,3 +164,75 @@ def roles_for(self, actor=None, anchors=()):
         roles = super(Label, self).roles_for(actor, anchors)
         roles.update(self.project.roles_for(actor, anchors))
         return roles
+
+
+class ProposalLabelProxyWrapper(object):
+    def __init__(self, obj):
+        object.__setattr__(self, '_obj', obj)
+
+    def __getattr__(self, name):
+        # What this does:
+        # 1. Check if the project has this label (including archived labels). If not, raise error
+        # 2. If this is not a parent label:
+        # 2a. Check if proposal has this label set. If so, return True, else False
+        # 3. If this is a parent label:
+        # 3a. If the proposal has one of the options set, return its name. If not, return None
+
+        label = Label.query.filter(
+            Label.name == name, Label.project == self._obj.project
+        ).one_or_none()
+        if not label:
+            raise AttributeError
+
+        if not label.is_main:
+            return label in self._obj.labels
+
+        # Only one option from a main label should be set at a time, but we enforce
+        # this in the UI, not in the db, so more than one may exist in the db.
+        label_options = list(set(self._obj.labels).intersection(set(label.options)))
+        return label_options[0].name if len(label_options) > 0 else None
+
+    def __setattr__(self, name, value):
+        label = Label.query.filter(
+            Label.name == name, Label.project == self._obj.project, Label._archived == False
+        ).one_or_none()  # NOQA
+        if not label:
+            raise AttributeError
+
+        if not label.is_main:
+            if value is True:
+                if label not in self._obj.labels:
+                    self._obj.labels.append(label)
+            elif value is False:
+                if label in self._obj.labels:
+                    self._obj.labels.remove(label)
+            else:
+                raise ValueError("This label can only be set to True or False")
+        else:
+            option_label = Label.query.filter_by(
+                main_label=label,
+                _archived=False,
+                name=value).one_or_none()
+            if not option_label:
+                raise ValueError("Invalid option for this label")
+
+            # Scan for conflicting labels and remove them. Iterate over a copy
+            # to allow mutation of the source list during iteration
+            for existing_label in list(self._obj.labels):
+                if existing_label != option_label and existing_label.main_label == option_label.main_label:
+                    self._obj.labels.remove(existing_label)
+
+            if option_label not in self._obj.labels:
+                self._obj.labels.append(option_label)
+
+
+class ProposalLabelProxy(object):
+    def __get__(self, obj, cls=None):
+        if obj is not None:
+            return ProposalLabelProxyWrapper(obj)
+        else:
+            return self
+
+
+#: For reading and setting labels from the edit form
+Proposal.formlabels = ProposalLabelProxy()
diff --git a/funnel/models/project.py b/funnel/models/project.py
index 7c350232f..7d30a80db 100644
--- a/funnel/models/project.py
+++ b/funnel/models/project.py
@@ -133,7 +133,7 @@ class Project(UuidMixin, BaseScopedNameMixin, db.Model):
     venues = db.relationship('Venue', cascade='all, delete-orphan',
         order_by='Venue.seq', collection_class=ordering_list('seq', count_from=1))
     labels = db.relationship('Label', cascade='all, delete-orphan',
-        primaryjoin='and_(Label.project_id == Project.id, Label.main_label_id == None)',
+        primaryjoin='and_(Label.project_id == Project.id, Label.main_label_id == None, Label._archived == False)',
         order_by='Label.seq', collection_class=ordering_list('seq', count_from=1))
     all_labels = db.relationship('Label', lazy='dynamic')
 
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 2dc6b2cf9..26375f8ef 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -88,35 +88,6 @@ def __setattr__(self, attr, value):
             self.data[attr] = value
 
 
-class ProposalLabelProxyWrapper(object):
-    def __init__(self, obj):
-        self.obj = obj
-
-    def __getattr__(self, name):
-        from .label import Label
-        if self.obj is not None:
-            main_label = Label.query.filter(Label.is_parent == True).filter_by(name=name, project=self.obj.project).first()  # NOQA
-            existing_label = set(self.obj.labels).intersection(set(main_label.options))
-            return existing_label.pop() if len(existing_label) > 0 else None
-
-    def __setattr__(self, name, value):
-        from .label import Label
-        if self.obj is not None:
-            main_label = Label.query.filter(Label.is_parent == True).filter_by(name=name, project=self.obj.project).first()  # NOQA
-            label = Label.query.filter(Label.main_label_id == main_label.id, Label.name == value).first()
-            if label is not None:
-                self.obj.assign_label(label)
-
-    def keys(self):
-        return [pl.name for pl in self.obj.project.labels] if self.obj is not None else []
-
-
-class ProposalLabelProxy(object):
-    def __get__(self, obj, cls=None):
-        if obj is not None:
-            return ProposalLabelProxyWrapper(obj)
-
-
 class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
     __tablename__ = 'proposal'
 
@@ -168,9 +139,6 @@ class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
     # Additional form data
     data = db.Column(JsonDict, nullable=False, server_default='{}')
 
-    # for managing relationship with labels easily
-    labelsets = ProposalLabelProxy()
-
     __table_args__ = (db.UniqueConstraint('project_id', 'url_id'),)
 
     # XXX: The following two may overlap. Reconsider whether both are needed
@@ -394,8 +362,8 @@ def assign_label(self, label):
         """
         if label in self.labels:
             return
-        if label.is_parent:
-            raise ValueError("Parent labels cannot be assigned to a proposal")
+        if label.is_main:
+            raise ValueError("This label requires one of its options to be used")
 
         if label.main_label is not None:
             existing_labels = set(label.main_label.options).intersection(set(self.labels))
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index e6974dec2..0be38ac3c 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -11,7 +11,7 @@
     {%- for label in labels %}
       <div class="grid__col-xs-12 grid__col-sm-4">
         <div class="card">
-          {% if label.is_parent %}
+          {% if label.is_main %}
             <div class="card__body card__body--minheight mui--text-subhead">
               <h3>{{ label.icon_emoji }} {{ label.title }}</h3>
               <ul class="mui-list--aligned mui-list--unstyled">
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index 408cfbf5c..a22c73f80 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -39,7 +39,7 @@
     {{ form.hidden_tag() }}
     {{ labelformfields(form) }}
     <div id="child-form">
-      {% if form.edit_obj and form.edit_obj.is_parent and subforms %}
+      {% if form.edit_obj and form.edit_obj.is_main and subforms %}
         {% for subform in subforms %}
           {{ labelformfields(subform, subform=true) }}
         {% endfor %}
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 48a6e7cc2..bdc59fdd6 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -107,7 +107,7 @@ def edit(self):
             form = SublabelForm(obj=self.obj, model=Label, parent=self.obj.project)
         else:
             form = LabelForm(obj=self.obj, model=Label, parent=self.obj.project)
-            if self.obj.is_parent:
+            if self.obj.is_main:
                 for subl in self.obj.options:
                     subforms.append(SublabelForm(obj=subl, parent=self.obj.project))
 
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index 90f686ea7..eeb20c0b2 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -12,7 +12,7 @@
 
 from .. import app, funnelapp, lastuser
 from ..models import db, Proposal, Comment
-from ..forms import (ProposalForm, CommentForm, DeleteCommentForm, get_proposal_labels_form,
+from ..forms import (ProposalForm, CommentForm, DeleteCommentForm,
     ProposalTransitionForm, ProposalMoveForm, ProposalLabelsForm)
 from .mixins import ProjectViewMixin, ProposalViewMixin
 from .decorators import legacy_redirect
@@ -99,11 +99,10 @@ def new_proposal(self):
             form.phone.data = g.user.phone
         if form.validate_on_submit():
             proposal = Proposal(user=current_auth.user, project=self.obj)
-            with db.session.no_autoflush:
-                proposal.voteset.vote(g.user)  # Vote up your own proposal by default
-            form.populate_obj(proposal.formdata)
+            form.populate_obj(proposal)
             proposal.name = make_name(proposal.title)
             db.session.add(proposal)
+            proposal.voteset.vote(g.user)  # Vote up your own proposal by default
             db.session.commit()
             flash(_("Your new session has been saved"), 'info')
             return redirect(proposal.url_for(), code=303)
@@ -167,11 +166,11 @@ def json(self):
     @lastuser.requires_login
     @requires_permission('edit-proposal')
     def edit(self):
-        form = ProposalForm(obj=self.obj.formdata, model=Proposal, parent=self.obj.project)
+        form = ProposalForm(obj=self.obj, model=Proposal, parent=self.obj.project)
         if self.obj.user != g.user:
             del form.speaking
         if form.validate_on_submit():
-            form.populate_obj(self.obj.formdata)
+            form.populate_obj(self.obj)
             self.obj.name = make_name(self.obj.title)
             self.obj.edited_at = datetime.utcnow()
             db.session.commit()
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index 1bc1f4cba..6a66d3f8f 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -8,7 +8,7 @@ class TestLabels(object):
     def test_main_label_from_fixture(self, test_client, new_main_label):
         assert new_main_label.title == u"Parent Label A"
         assert new_main_label.seq == 1
-        assert new_main_label.is_parent
+        assert new_main_label.is_main
         assert new_main_label.required
         assert new_main_label.restricted
         assert not new_main_label.archived
@@ -20,13 +20,13 @@ def test_child_label_from_fixture(self, test_client, test_db, new_main_label):
         assert label_a1.title == u"Label A1"
         assert label_a1.icon_emoji == u"👍"
         assert label_a1.icon == u"👍"
-        assert not label_a1.is_parent
+        assert not label_a1.is_main
 
     def test_label_from_fixture(self, test_client, test_db, new_label):
         assert new_label.title == u"Label B"
         assert new_label.icon_emoji == u"🔟"
         assert new_label.icon == u"🔟"
-        assert not new_label.is_parent
+        assert not new_label.is_main
 
         with pytest.raises(ValueError):
             # because Label B is not a parent label, it cannot be required

From 6800399a12cc58cfecb05c7530b5bbfda5de69ce Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 22 Apr 2019 14:14:56 +0530
Subject: [PATCH 058/125] Validator message

---
 funnel/forms/proposal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 1a95ee8d8..e6af59d62 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -22,7 +22,7 @@ class ProposalLabelForm(forms.Form):
             setattr(ProposalLabelForm, label.name, forms.RadioField(
                 label.title,
                 description=label.description,
-                validators=[forms.validators.DataRequired()] if label.required else [],
+                validators=[forms.validators.DataRequired(_("Please select one"))] if label.required else [],
                 choices=[(option.name, option.title) for option in label.options]
             ))
 

From a6d14119a1eb95d3c889f0ed7d81aa954985f673 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Mon, 22 Apr 2019 14:23:10 +0530
Subject: [PATCH 059/125] Check for emoji on proposal page

---
 funnel/templates/proposal.html.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 7d1360a77..240ac04cd 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -100,7 +100,7 @@
         </div>
         <div class="proposal-details proposal-details--right">
           {%- for label in proposal.labels %}
-            <span class="label mui--text-bold">{{ label.icon_emoji }} {% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
+            <span class="label mui--text-bold">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
           {%- endfor %}
         </div>
       </div>

From f802f494636bf0b2319628bdf5280ee82853b569 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 22 Apr 2019 14:34:07 +0530
Subject: [PATCH 060/125] Ignore archived label options

---
 funnel/forms/proposal.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index e6af59d62..eb95e86d9 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -22,8 +22,8 @@ class ProposalLabelForm(forms.Form):
             setattr(ProposalLabelForm, label.name, forms.RadioField(
                 label.title,
                 description=label.description,
-                validators=[forms.validators.DataRequired(_("Please select one"))] if label.required else [],
-                choices=[(option.name, option.title) for option in label.options]
+                validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
+                choices=[(option.name, option.title) for option in label.options if not option.archived]
             ))
 
     return ProposalLabelForm(obj=proposal.formlabels if proposal else None)

From af8aee679c929c6f2038fa2f01f8f25174e86d70 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Mon, 22 Apr 2019 14:42:05 +0530
Subject: [PATCH 061/125] old labels are not restricted

---
 .../versions/e2be4ab896d3_migrate_old_labels.py     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/migrations/versions/e2be4ab896d3_migrate_old_labels.py b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
index ac7144d5e..0896226cd 100644
--- a/migrations/versions/e2be4ab896d3_migrate_old_labels.py
+++ b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
@@ -75,15 +75,16 @@ def upgrade():
             # create section labelset for the project
             labset = conn.execute(label.insert().values({
                     'project_id': proj['id'], 'name': u"section", 'title': u"Section",
-                    'seq': 1, 'description': u"", 'restricted': True, 'archived': False,
+                    'seq': 1, 'description': u"", 'restricted': False, 'archived': False,
                     'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
                 }).returning(label.c.id)).first()
 
             sections = conn.execute(section.select().where(section.c.project_id == proj['id']))
             for index, sec in enumerate(sections, start=1):
                 lab = conn.execute(label.insert().values({
+                    'main_label_id': labset[0],
                     'project_id': proj['id'], 'name': sec['name'], 'title': sec['title'],
-                    'seq': index, 'description': u"", 'restricted': True, 'archived': False,
+                    'seq': index, 'description': u"", 'restricted': False, 'archived': False,
                     'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
                 }).returning(label.c.id, label.c.name)).first()
 
@@ -98,7 +99,7 @@ def upgrade():
         # technical level
         labset = conn.execute(label.insert().values({
             'project_id': proj['id'], 'name': u"technical-level", 'title': u"Technical Level",
-            'seq': 1, 'description': u"", 'restricted': True, 'archived': False,
+            'seq': 1, 'description': u"", 'restricted': False, 'archived': False,
             'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
         }).returning(label.c.id)).first()
         tl_list = [('beginner', "Beginner"), ('intermediate', "Intermediate"), ('advanced', "Advanced")]
@@ -106,7 +107,7 @@ def upgrade():
             tl_name, tl_title = tl
             lab = conn.execute(label.insert().values({
                     'project_id': proj['id'], 'name': tl_name, 'title': tl_title, 'main_label_id': labset[0],
-                    'seq': index, 'description': u"", 'restricted': True, 'archived': False,
+                    'seq': index, 'description': u"", 'restricted': False, 'archived': False,
                     'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
                 }).returning(label.c.id, label.c.name)).first()
 
@@ -121,7 +122,7 @@ def upgrade():
         # session type
         labset = conn.execute(label.insert().values({
                 'project_id': proj['id'], 'name': u"session-type", 'title': u"Session Type",
-                'seq': 1, 'description': u"", 'restricted': True, 'archived': False,
+                'seq': 1, 'description': u"", 'restricted': False, 'archived': False,
                 'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
             }).returning(label.c.id)).first()
         st_list = [('lecture', "Lecture"), ('demo', "Demo"), ('tutorial', "Tutorial"), ('workshop', "Workshop"), ('discussion', "Discussion"), ('panel', "Panel")]
@@ -129,7 +130,7 @@ def upgrade():
             st_name, st_title = st
             lab = conn.execute(label.insert().values({
                     'project_id': proj['id'], 'name': st_name, 'title': st_title, 'main_label_id': labset[0],
-                    'seq': index, 'description': u"", 'restricted': True, 'archived': False,
+                    'seq': index, 'description': u"", 'restricted': False, 'archived': False,
                     'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
                 }).returning(label.c.id, label.c.name)).first()
 

From 6b3391b4b2db09256924822dbca4788e1480b3ef Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 22 Apr 2019 14:49:16 +0530
Subject: [PATCH 062/125] Remove unused ProposalFormData (from #109)

This can come back when we add custom form fields
---
 funnel/models/proposal.py | 51 ---------------------------------------
 1 file changed, 51 deletions(-)

diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 26375f8ef..d583c18e1 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.hybrid import hybrid_property
 from werkzeug.utils import cached_property
 from . import db, TimestampMixin, UuidMixin, BaseScopedIdNameMixin, MarkdownColumn, JsonDict, CoordinatesMixin, UrlType
@@ -51,42 +50,6 @@ class PROPOSAL_STATE(LabeledEnum):
 
 # --- Models ------------------------------------------------------------------
 
-class ProposalFormData(object):
-    """
-    Form data access helper for custom fields
-    """
-    def __init__(self, proposal):
-        self.__dict__['proposal'] = proposal
-        self.__dict__['data'] = proposal.data
-
-    def __getattr__(self, attr, default=_marker):
-        if attr in self.proposal.__invalid_fields__ or attr.startswith('_'):
-            raise AttributeError("Invalid attribute: %s" % attr)
-
-        if default is _marker:
-            try:
-                if hasattr(self.proposal, attr):
-                    return getattr(self.proposal, attr)
-                return self.data[attr]
-            except KeyError:
-                raise AttributeError(attr)
-        else:
-            if hasattr(self.proposal, attr):
-                return getattr(self.proposal, attr, default)
-            return self.data.get(attr, default)
-
-    def __setattr__(self, attr, value):
-        if attr in self.proposal.__invalid_fields__ or attr.startswith('_'):
-            raise AttributeError("Invalid attribute: %s" % attr)
-
-        if hasattr(self.proposal, attr):
-            if attr in self.proposal.__valid_fields__:
-                setattr(self.proposal, attr, value)
-            else:
-                raise AttributeError("Cannot set attribute: %s" % attr)
-        else:
-            self.data[attr] = value
-
 
 class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
     __tablename__ = 'proposal'
@@ -141,16 +104,6 @@ class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
 
     __table_args__ = (db.UniqueConstraint('project_id', 'url_id'),)
 
-    # XXX: The following two may overlap. Reconsider whether both are needed
-
-    # Allow these fields to be set on the proposal by custom forms
-    __valid_fields__ = ('title', 'speaker', 'speaking', 'email', 'phone', 'bio', 'section', 'objective', 'session_type',
-        'technical_level', 'description', 'requirements', 'slides', 'preview_video', 'links', 'location',
-        'latitude', 'longitude', 'coordinates')
-    # Never allow these fields to be set on the proposal or proposal.data by custom forms
-    __invalid_fields__ = ('id', 'name', 'url_id', 'user_id', 'user', 'speaker_id', 'project_id',
-        'project', 'parent', 'voteset_id', 'voteset', 'commentset_id', 'commentset', 'edited_at', 'data')
-
     __roles__ = {
         'all': {
             'read': {
@@ -279,10 +232,6 @@ def move_to(self, project):
         self.url_id = None
         self.make_id()
 
-    @property
-    def formdata(self):
-        return ProposalFormData(self)
-
     @property
     def owner(self):
         return self.speaker or self.user

From 1e8433d03f5be732e89ade8db52379d6920daa2d Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 22 Apr 2019 15:00:28 +0530
Subject: [PATCH 063/125] No CSRF in form fields

---
 funnel/forms/proposal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index eb95e86d9..22d8bd283 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -26,7 +26,7 @@ class ProposalLabelForm(forms.Form):
                 choices=[(option.name, option.title) for option in label.options if not option.archived]
             ))
 
-    return ProposalLabelForm(obj=proposal.formlabels if proposal else None)
+    return ProposalLabelForm(obj=proposal.formlabels if proposal else None, meta={'csrf': False})
 
 
 class TransferProposal(forms.Form):

From 33e5b0bbb13e3bb77e9b860aaf414f1376ee7533 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Mon, 22 Apr 2019 15:10:31 +0530
Subject: [PATCH 064/125] Check for emoji

---
 funnel/templates/labels.html.jinja2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 0be38ac3c..e5326a83d 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -13,11 +13,11 @@
         <div class="card">
           {% if label.is_main %}
             <div class="card__body card__body--minheight mui--text-subhead">
-              <h3>{{ label.icon_emoji }} {{ label.title }}</h3>
+              <h3>{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
               <ul class="mui-list--aligned mui-list--unstyled">
                 {%- for sublabel in label.options %}
                   <li>
-                    <span class="mui--text-subhead"><strong>{{ sublabel.icon_emoji }} {{ sublabel.title }}</strong></span>
+                    <span class="mui--text-subhead"><strong>{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }}{% endif %} {{ sublabel.title }}</strong></span>
                   </li>
                 {% else %}
                   <li class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></li>

From d424ee358d5e7d9ca7d1f9b7e06ceb9e3a2f4263 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Mon, 22 Apr 2019 15:11:51 +0530
Subject: [PATCH 065/125] only showing icon emoji if it's available

---
 funnel/templates/labels.html.jinja2   | 2 +-
 funnel/templates/proposal.html.jinja2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 0be38ac3c..7c5cd2830 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -17,7 +17,7 @@
               <ul class="mui-list--aligned mui-list--unstyled">
                 {%- for sublabel in label.options %}
                   <li>
-                    <span class="mui--text-subhead"><strong>{{ sublabel.icon_emoji }} {{ sublabel.title }}</strong></span>
+                    <span class="mui--text-subhead"><strong>{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</strong></span>
                   </li>
                 {% else %}
                   <li class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></li>
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 7d1360a77..25b30bbff 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -100,7 +100,7 @@
         </div>
         <div class="proposal-details proposal-details--right">
           {%- for label in proposal.labels %}
-            <span class="label mui--text-bold">{{ label.icon_emoji }} {% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
+            <span class="label mui--text-bold">{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
           {%- endfor %}
         </div>
       </div>

From bf1c304ea9ea0601566cc288c48cdb8d16d60845 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 22 Apr 2019 15:23:29 +0530
Subject: [PATCH 066/125] Friendlier messaging in label form; appropriate name

---
 funnel/forms/label.py | 29 ++++++++++++-----------------
 funnel/views/label.py | 17 ++++++++---------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 553bd705a..8fa99ce1a 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -2,26 +2,21 @@
 
 from baseframe import __
 import baseframe.forms as forms
-from .project import valid_color_re
 
-__all__ = ['LabelForm', 'SublabelForm']
+__all__ = ['LabelForm', 'LabelOptionForm']
 
 
 class LabelForm(forms.Form):
-    title = forms.StringField(__("Title"),
-        validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
-    icon_emoji = forms.StringField(__(""))
-    required = forms.BooleanField(__("Required"), default=False,
-        description=__("When required is set, this label must be set for a proposal (e.g. Proposal Type)."))
-    restricted = forms.BooleanField(__("Restricted"), default=False,
-        description=__("When in restricted mode, only an admin or reviewer can set this label for a proposal (e.g. Proposal Status)."))
+    title = forms.StringField(__("Label"),
+        validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
+    icon_emoji = forms.StringField(__("Icon"))
+    required = forms.BooleanField(__("Make this label mandatory in proposal forms"), default=False,
+        description=__("If checked, proposers must select one of the options"))
+    restricted = forms.BooleanField(__("Restrict use of this label to editors"), default=False,
+        description=__("If checked, only editors and reviewers can apply this label on proposals"))
 
-    def validate_bgcolor(self, field):
-        if not valid_color_re.match(field.data):
-            raise forms.ValidationError("Please enter a valid color code")
 
-
-class SublabelForm(forms.Form):
-    title = forms.StringField(__("Name"), description=__("Name of the label"),
-        validators=[forms.validators.DataRequired(), forms.validators.Length(max=250)])
-    icon_emoji = forms.StringField(__(""))
+class LabelOptionForm(forms.Form):
+    title = forms.StringField(__("Option"),
+        validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
+    icon_emoji = forms.StringField(__("Icon"))
diff --git a/funnel/views/label.py b/funnel/views/label.py
index bdc59fdd6..fb8be0300 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 
-from flask import flash, redirect, g, render_template, request
+from flask import flash, redirect, g, request
 from werkzeug.datastructures import MultiDict
 from coaster.views import render_with, requires_permission, route, UrlForView, ModelView
 from baseframe import _
-from baseframe.forms import render_delete_sqla, render_form
 
 from .. import app, funnelapp, lastuser
 from ..models import Label, db, Project, Profile
-from ..forms import LabelForm, SublabelForm
+from ..forms import LabelForm, LabelOptionForm
 from .mixins import ProjectViewMixin
 from .decorators import legacy_redirect
 
@@ -30,7 +29,7 @@ def labels(self):
     @requires_permission('admin')
     def new_label(self):
         form = LabelForm(model=Label, parent=self.obj.parent)
-        emptysubform = SublabelForm(MultiDict({}))
+        emptysubform = LabelOptionForm(MultiDict({}))
         if form.validate_on_submit():
             # This form can send one or multiple values for title and icon_emoji.
             # If the label doesn't have any sublabel, one value is sent for each list,
@@ -50,7 +49,7 @@ def new_label(self):
             db.session.add(label)
 
             for idx, title in enumerate(titlelist):
-                subform = SublabelForm(MultiDict({
+                subform = LabelOptionForm(MultiDict({
                     'csrf_token': form.csrf_token.data, 'title': titlelist[idx],
                     'icon_emoji': emojilist[idx]
                     }))
@@ -100,16 +99,16 @@ def loader(self, profile, project, label):
     @render_with('labels_form.html.jinja2')
     @requires_permission('edit_project')
     def edit(self):
-        emptysubform = SublabelForm(MultiDict({}))
+        emptysubform = LabelOptionForm(MultiDict({}))
         subforms = []
         if self.obj.main_label:
             # It's a sublabel
-            form = SublabelForm(obj=self.obj, model=Label, parent=self.obj.project)
+            form = LabelOptionForm(obj=self.obj, model=Label, parent=self.obj.project)
         else:
             form = LabelForm(obj=self.obj, model=Label, parent=self.obj.project)
             if self.obj.is_main:
                 for subl in self.obj.options:
-                    subforms.append(SublabelForm(obj=subl, parent=self.obj.project))
+                    subforms.append(LabelOptionForm(obj=subl, parent=self.obj.project))
 
         if form.validate_on_submit():
             form.populate_obj(self.obj)
@@ -129,7 +128,7 @@ def edit(self):
                     subl.title = titlelist[idx]
                     subl.icon_emoji = emojilist[idx]
                 else:
-                    subform = SublabelForm(MultiDict({
+                    subform = LabelOptionForm(MultiDict({
                         'csrf_token': form.csrf_token.data, 'title': titlelist[idx],
                         'icon_emoji': emojilist[idx]
                         }))

From 7859fb55c4c5c106b4a854bf26a4c5dca0e95a1d Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 22 Apr 2019 15:25:34 +0530
Subject: [PATCH 067/125] Rename label.is_main to has_options

---
 funnel/forms/proposal.py                 |  2 +-
 funnel/models/label.py                   | 14 +++++++-------
 funnel/models/proposal.py                |  2 +-
 funnel/templates/labels.html.jinja2      |  2 +-
 funnel/templates/labels_form.html.jinja2 |  2 +-
 funnel/views/label.py                    |  2 +-
 tests/unit/models/test_label.py          |  6 +++---
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 22d8bd283..c96d5a314 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -18,7 +18,7 @@ class ProposalLabelForm(forms.Form):
         pass
 
     for label in project.labels:
-        if label.is_main and not label.archived and not label.restricted:
+        if label.has_options and not label.archived and not label.restricted:
             setattr(ProposalLabelForm, label.name, forms.RadioField(
                 label.title,
                 description=label.description,
diff --git a/funnel/models/label.py b/funnel/models/label.py
index 0b7f6d2d9..6f710271e 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -116,20 +116,20 @@ def archived(cls):
         ], else_=cls._archived)
 
     @hybrid_property
-    def is_main(self):
+    def has_options(self):
         return len(self.options) != 0
 
-    @is_main.expression
-    def is_main(cls):
+    @has_options.expression
+    def has_options(cls):
         return exists().where(Label.main_label_id == cls.id)
 
     @hybrid_property
     def required(self):
-        return self._required if self.is_main else False
+        return self._required if self.has_options else False
 
     @required.setter
     def required(self, value):
-        if value and not self.is_main:
+        if value and not self.has_options:
             raise ValueError("Labels without options cannot be mandatory")
         self._required = value
 
@@ -184,7 +184,7 @@ def __getattr__(self, name):
         if not label:
             raise AttributeError
 
-        if not label.is_main:
+        if not label.has_options:
             return label in self._obj.labels
 
         # Only one option from a main label should be set at a time, but we enforce
@@ -199,7 +199,7 @@ def __setattr__(self, name, value):
         if not label:
             raise AttributeError
 
-        if not label.is_main:
+        if not label.has_options:
             if value is True:
                 if label not in self._obj.labels:
                     self._obj.labels.append(label)
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index d583c18e1..c043eef78 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -311,7 +311,7 @@ def assign_label(self, label):
         """
         if label in self.labels:
             return
-        if label.is_main:
+        if label.has_options:
             raise ValueError("This label requires one of its options to be used")
 
         if label.main_label is not None:
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index e5326a83d..9b54846ff 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -11,7 +11,7 @@
     {%- for label in labels %}
       <div class="grid__col-xs-12 grid__col-sm-4">
         <div class="card">
-          {% if label.is_main %}
+          {% if label.has_options %}
             <div class="card__body card__body--minheight mui--text-subhead">
               <h3>{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
               <ul class="mui-list--aligned mui-list--unstyled">
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index a22c73f80..6005bdb56 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -39,7 +39,7 @@
     {{ form.hidden_tag() }}
     {{ labelformfields(form) }}
     <div id="child-form">
-      {% if form.edit_obj and form.edit_obj.is_main and subforms %}
+      {% if form.edit_obj and form.edit_obj.has_options and subforms %}
         {% for subform in subforms %}
           {{ labelformfields(subform, subform=true) }}
         {% endfor %}
diff --git a/funnel/views/label.py b/funnel/views/label.py
index fb8be0300..9397bf78f 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -106,7 +106,7 @@ def edit(self):
             form = LabelOptionForm(obj=self.obj, model=Label, parent=self.obj.project)
         else:
             form = LabelForm(obj=self.obj, model=Label, parent=self.obj.project)
-            if self.obj.is_main:
+            if self.obj.has_options:
                 for subl in self.obj.options:
                     subforms.append(LabelOptionForm(obj=subl, parent=self.obj.project))
 
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index 6a66d3f8f..02b09cfbb 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -8,7 +8,7 @@ class TestLabels(object):
     def test_main_label_from_fixture(self, test_client, new_main_label):
         assert new_main_label.title == u"Parent Label A"
         assert new_main_label.seq == 1
-        assert new_main_label.is_main
+        assert new_main_label.has_options
         assert new_main_label.required
         assert new_main_label.restricted
         assert not new_main_label.archived
@@ -20,13 +20,13 @@ def test_child_label_from_fixture(self, test_client, test_db, new_main_label):
         assert label_a1.title == u"Label A1"
         assert label_a1.icon_emoji == u"👍"
         assert label_a1.icon == u"👍"
-        assert not label_a1.is_main
+        assert not label_a1.has_options
 
     def test_label_from_fixture(self, test_client, test_db, new_label):
         assert new_label.title == u"Label B"
         assert new_label.icon_emoji == u"🔟"
         assert new_label.icon == u"🔟"
-        assert not new_label.is_main
+        assert not new_label.has_options
 
         with pytest.raises(ValueError):
             # because Label B is not a parent label, it cannot be required

From beadac54024cf42330d2b663909f07d0b98c1a5d Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 22 Apr 2019 15:33:11 +0530
Subject: [PATCH 068/125] Names should be in singular as per coding convention

---
 funnel/forms/proposal.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index c96d5a314..89de6841c 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -10,7 +10,7 @@
     'ProposalMoveForm']
 
 
-def proposal_labels_form(project, proposal):
+def proposal_label_form(project, proposal):
     """
     Returns a label form for the given project and proposal.
     """
@@ -37,7 +37,7 @@ class ProposalLabelsForm(forms.Form):
     formlabels = forms.FormField(forms.Form, __("Labels"))
 
     def set_queries(self):
-        self.formlabels.form = proposal_labels_form(project=self.edit_parent, proposal=self.edit_obj)
+        self.formlabels.form = proposal_label_form(project=self.edit_parent, proposal=self.edit_obj)
 
 
 class ProposalForm(forms.Form):
@@ -90,7 +90,7 @@ def __init__(self, *args, **kwargs):
             self.description.description = project.proposal_part_b.get('hint')
 
     def set_queries(self):
-        self.formlabels.form = proposal_labels_form(project=self.edit_parent, proposal=self.edit_obj)
+        self.formlabels.form = proposal_label_form(project=self.edit_parent, proposal=self.edit_obj)
 
 
 class ProposalTransitionForm(forms.Form):

From 02c9ae010a88c8c2311bb3a835bb99d0c815e764 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 22 Apr 2019 15:35:30 +0530
Subject: [PATCH 069/125] Remove label "icon" title in form (for now)

---
 funnel/forms/label.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 8fa99ce1a..a39f16e1b 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -9,7 +9,7 @@
 class LabelForm(forms.Form):
     title = forms.StringField(__("Label"),
         validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
-    icon_emoji = forms.StringField(__("Icon"))
+    icon_emoji = forms.StringField("")
     required = forms.BooleanField(__("Make this label mandatory in proposal forms"), default=False,
         description=__("If checked, proposers must select one of the options"))
     restricted = forms.BooleanField(__("Restrict use of this label to editors"), default=False,
@@ -19,4 +19,4 @@ class LabelForm(forms.Form):
 class LabelOptionForm(forms.Form):
     title = forms.StringField(__("Option"),
         validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
-    icon_emoji = forms.StringField(__("Icon"))
+    icon_emoji = forms.StringField("")

From 15c31dadd6d12459cf2fced629b2b3be93ad982b Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Mon, 22 Apr 2019 21:36:29 +0530
Subject: [PATCH 070/125] Add drag functionality to set sequence of sub labels

---
 funnel/__init__.py                       |  14 +-
 funnel/static/css/app.css                | 181 +++++++++++++----------
 funnel/static/sass/_form.scss            | 110 +++++++++++++-
 funnel/static/sass/_schedule.scss        |  75 ----------
 funnel/templates/labels_form.html.jinja2 |  56 +++++--
 funnel/templates/proposal.html.jinja2    |  44 ++++++
 6 files changed, 308 insertions(+), 172 deletions(-)

diff --git a/funnel/__init__.py b/funnel/__init__.py
index 70ac06b0a..2fc7e600d 100644
--- a/funnel/__init__.py
+++ b/funnel/__init__.py
@@ -101,11 +101,14 @@
     Bundle(assets.require('leaflet.css', 'leaflet-search.css'),
         output='css/leaflet.packed.css', filters='cssmin'))
 app.assets.register('js_emojionearea',
-    Bundle(assets.require('!jquery.js', 'emojionearea.js'),
+    Bundle(assets.require('!jquery.js', 'emojionearea-material.js'),
         output='js/emojionearea.packed.js', filters='uglipyjs'))
 app.assets.register('css_emojionearea',
-    Bundle(assets.require('emojionearea.css'),
+    Bundle(assets.require('emojionearea-material.css'),
         output='css/emojionearea.packed.css', filters='cssmin'))
+app.assets.register('js_sortable',
+    Bundle(assets.require('!jquery.js', 'jquery.ui.js', 'jquery.ui.sortable.touch.js'),
+        output='js/sortable.packed.js', filters='uglipyjs'))
 
 
 baseframe.init_app(funnelapp, requires=['funnel'], ext_requires=[
@@ -141,11 +144,14 @@
     Bundle(assets.require('leaflet.css', 'leaflet-search.css'),
         output='css/leaflet.packed.css', filters='cssmin'))
 funnelapp.assets.register('js_emojionearea',
-    Bundle(assets.require('!jquery.js', 'emojionearea.js'),
+    Bundle(assets.require('!jquery.js', 'emojionearea-material.js'),
         output='js/emojionearea.packed.js', filters='uglipyjs'))
 funnelapp.assets.register('css_emojionearea',
-    Bundle(assets.require('emojionearea.css'),
+    Bundle(assets.require('emojionearea-material.css'),
         output='css/emojionearea.packed.css', filters='cssmin'))
+funnelapp.assets.register('js_sortable',
+    Bundle(assets.require('!jquery.js', 'jquery.ui.js', 'jquery.ui.sortable.touch.js'),
+        output='js/sortable.packed.js', filters='uglipyjs'))
 
 # FIXME: Hack for external build system generating relative /static URLs.
 # Fix this by generating absolute URLs to the static subdomain during build.
diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 7d3dfd18b..c5738aef4 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -416,12 +416,20 @@ html.touch .collapsible__body--disable {
   display: inline-block;
 }
 
+.label-title--close {
+  width: calc(100% - 114px);
+  display: inline-block;
+}
+
 .mui-form__fields.emojipicker {
   float: left;
   width: 70px;
   height: 48px;
   margin-right: 20px;
 }
+.mui-form__fields.emojipicker label {
+  display: none;
+}
 .mui-form__fields.emojipicker .emojionearea-editor {
   height: 48px;
   min-height: 20px;
@@ -438,13 +446,104 @@ html.touch .collapsible__body--disable {
 }
 .mui-form__fields.emojipicker .emojionearea-editor {
   left: 6px !important;
+  padding-right: 45px !important;
 }
-.mui-form__fields.emojipicker .emojionearea-button .emojionearea-button-open {
-  right: 0;
+.mui-form__fields.emojipicker .emojionearea-button .emojionearea-button-open,
+.mui-form__fields.emojipicker .emojionearea-button .emojionearea-button-close {
+  right: 3px;
+}
+.mui-form__fields.emojipicker .emojionearea .emojionearea-editor [class*=emojione-], .mui-form__fields.emojipicker .emojionearea .emojionearea-editor .emojioneemoji {
+  margin: -.2ex 1ex .2ex -0.5ex;
 }
 
-.label-form-modal {
-  overflow: visible;
+.sub-form-field {
+  box-shadow: 0 0 2px rgba(0, 0, 0, 0.12), 0 2px 2px rgba(0, 0, 0, 0.2);
+  margin: 10px 0 10px 20px;
+  padding: 10px;
+}
+
+.ui-dragable-box {
+  padding: 25px 10px 10px 20px;
+  border-radius: 3px;
+  border: 1px solid #ddd;
+  background: #FFF;
+  cursor: pointer;
+  position: relative;
+  margin: 10px 15px;
+}
+
+.ui-dragable-box--header {
+  padding: 0;
+  margin: 10px 0;
+}
+
+.ui-dragable-box--header .collapsible__header {
+  margin: 0;
+}
+
+.ui-dragable-box label {
+  cursor: pointer;
+}
+
+.ui-dragable-box .drag-icon {
+  position: absolute;
+  left: 5px;
+  top: 0;
+}
+
+.ui-dragable-box:hover {
+  cursor: pointer;
+  box-shadow: 0 1px 3px rgba(158, 158, 158, 0.12), 0 1px 2px rgba(158, 158, 158, 0.24);
+}
+
+.ui-box-placeholder, .ui-box-placeholder--bigger {
+  margin: 10px 15px;
+  padding: 10px;
+  border-radius: 3px;
+  border: 1px solid #ddd;
+  background: #FFF;
+  height: 55px;
+}
+
+.ui-box-placeholder--bigger {
+  margin: 10px 0;
+  height: 80px;
+}
+
+.seq-input {
+  position: absolute;
+  right: 0px;
+  width: 20px;
+  border: 0;
+  top: 5px;
+  font-size: 14px;
+  line-height: 1;
+  color: #8492A6;
+}
+
+.seq-input--bg {
+  background: #EFF2F7;
+}
+
+.seq-input:focus,
+.seq-input:active {
+  outline: none;
+}
+
+.ui-dragable-box .sp-replacer {
+  margin-top: 5px;
+  margin-left: 5px;
+}
+
+.mui-form--smaller {
+  max-width: 500px;
+}
+
+.remove-btn {
+  position: absolute;
+  top: 0;
+  z-index: 100;
+  right: 5px;
 }
 
 .clickable-card {
@@ -1356,80 +1455,6 @@ body > .proposal-box.ui-draggable {
   margin-top: 10px;
 }
 
-.ui-dragable-box {
-  padding: 25px 10px 10px 20px;
-  border-radius: 3px;
-  border: 1px solid #333;
-  background: #FFF;
-  cursor: pointer;
-  position: relative;
-  margin: 10px 15px;
-}
-
-.ui-dragable-box--header {
-  border: 1px solid #ddd;
-  padding: 0;
-  margin: 10px 0;
-}
-
-.ui-dragable-box--header .collapsible__header {
-  margin: 0;
-}
-
-.ui-dragable-box label {
-  cursor: pointer;
-}
-
-.ui-dragable-box .drag-icon {
-  position: absolute;
-  left: 5px;
-  top: 0;
-}
-
-.ui-dragable-box:hover {
-  cursor: pointer;
-  box-shadow: 0 1px 3px rgba(158, 158, 158, 0.12), 0 1px 2px rgba(158, 158, 158, 0.24);
-}
-
-.ui-box-placeholder, .ui-box-placeholder--bigger {
-  margin: 10px 15px;
-  padding: 10px;
-  border-radius: 3px;
-  border: 1px solid #ddd;
-  background: #FFF;
-  height: 55px;
-}
-
-.ui-box-placeholder--bigger {
-  margin: 10px 0;
-  height: 80px;
-}
-
-.seq-input {
-  position: absolute;
-  right: 0px;
-  width: 20px;
-  border: 0;
-  top: 5px;
-  font-size: 14px;
-  line-height: 1;
-  color: #8492A6;
-}
-
-.seq-input--bg {
-  background: #EFF2F7;
-}
-
-.seq-input:focus,
-.seq-input:active {
-  outline: none;
-}
-
-.ui-dragable-box .sp-replacer {
-  margin-top: 5px;
-  margin-left: 5px;
-}
-
 .footer {
   padding-bottom: 50px;
 }
diff --git a/funnel/static/sass/_form.scss b/funnel/static/sass/_form.scss
index 8a7f5d9a7..5d8b96523 100644
--- a/funnel/static/sass/_form.scss
+++ b/funnel/static/sass/_form.scss
@@ -26,12 +26,21 @@
   display: inline-block;
 }
 
+.label-title--close {
+  width: calc(100% - 114px);
+  display: inline-block;
+}
+
 .mui-form__fields.emojipicker {
   float: left;
   width: 70px;
   height: 48px;
   margin-right: 20px;
 
+  label {
+    display: none;
+  }
+
   .emojionearea-editor {
     height: 48px;
     min-height: 20px;
@@ -50,13 +59,106 @@
 
   .emojionearea-editor {
     left: 6px !important;
+    padding-right: 45px !important;
   }
 
-  .emojionearea-button .emojionearea-button-open {
-    right: 0;
+  .emojionearea-button .emojionearea-button-open,
+  .emojionearea-button .emojionearea-button-close {
+    right: 3px;
   }
+
+  .emojionearea .emojionearea-editor [class*=emojione-], .emojionearea .emojionearea-editor .emojioneemoji {
+    margin: -.2ex 1ex .2ex -0.5ex;
+  }
+}
+
+.sub-form-field {
+  box-shadow: 0 0 2px rgba(0,0,0,0.12), 0 2px 2px rgba(0,0,0,0.2);
+  margin: 10px 0 10px 20px;
+  padding: 10px;
+}
+
+.ui-dragable-box {
+  padding: 25px 10px 10px 20px;
+  border-radius: 3px;
+  border: 1px solid #ddd;
+  background: #FFF;
+  cursor: pointer;
+  position: relative;
+  margin: 10px 15px;
+}
+
+.ui-dragable-box--header {
+  padding: 0;
+  margin: 10px 0;
+}
+
+.ui-dragable-box--header .collapsible__header {
+  margin: 0;
+}
+
+.ui-dragable-box label {
+  cursor: pointer;
+}
+
+.ui-dragable-box .drag-icon {
+  position: absolute;
+  left: 5px;
+    top: 0;
+}
+
+.ui-dragable-box:hover {
+  cursor: pointer;
+  box-shadow: 0 1px 3px rgba(158,158,158,0.12), 0 1px 2px rgba(158,158,158,0.24);
+}
+
+.ui-box-placeholder {
+  margin: 10px 15px;
+  padding: 10px;
+  border-radius: 3px;
+    border: 1px solid #ddd;
+    background: #FFF;
+    height: 55px;
+}
+
+.ui-box-placeholder--bigger {
+  @extend .ui-box-placeholder;
+  margin: 10px 0;
+  height: 80px;
+}
+
+.seq-input {
+    position: absolute;
+    right: 0px;
+    width: 20px;
+    border: 0;
+    top: 5px;
+    font-size: 14px;
+    line-height: 1;
+    color: #8492A6;
+}
+
+.seq-input--bg {
+  background: #EFF2F7;
+}
+
+.seq-input:focus,
+.seq-input:active {
+  outline: none;
+}
+
+.ui-dragable-box .sp-replacer {
+  margin-top: 5px;
+  margin-left: 5px;
+}
+
+.mui-form--smaller {
+  max-width: 500px;
 }
 
-.label-form-modal {
-  overflow: visible;
+.remove-btn {
+  position: absolute;
+  top: 0;
+  z-index: 100;
+  right: 5px;
 }
\ No newline at end of file
diff --git a/funnel/static/sass/_schedule.scss b/funnel/static/sass/_schedule.scss
index 542d2025c..bce5b4b03 100644
--- a/funnel/static/sass/_schedule.scss
+++ b/funnel/static/sass/_schedule.scss
@@ -293,78 +293,3 @@ body>.proposal-box.ui-draggable {
 	margin-top: 10px;
 }
 
-.ui-dragable-box {
-	padding: 25px 10px 10px 20px;
-	border-radius: 3px;
-  	border: 1px solid #333;
-  	background: #FFF;
-  	cursor: pointer;
-  	position: relative;
-  	margin: 10px 15px;
-}
-
-.ui-dragable-box--header {
-	border: 1px solid #ddd;
-	padding: 0;
-	margin: 10px 0;
-}
-
-.ui-dragable-box--header .collapsible__header {
-	margin: 0;
-}
-
-.ui-dragable-box label {
-	cursor: pointer;
-}
-
-.ui-dragable-box .drag-icon {
-	position: absolute;
-	left: 5px;
-    top: 0;
-}
-
-.ui-dragable-box:hover {
-	cursor: pointer;
-	box-shadow: 0 1px 3px rgba(158,158,158,0.12), 0 1px 2px rgba(158,158,158,0.24);
-}
-
-.ui-box-placeholder {
-	margin: 10px 15px;
-	padding: 10px;
-	border-radius: 3px;
-  	border: 1px solid #ddd;
-  	background: #FFF;
-  	height: 55px;
-}
-
-.ui-box-placeholder--bigger {
-	@extend .ui-box-placeholder;
-	margin: 10px 0;
-	height: 80px;
-}
-
-.seq-input {
-    position: absolute;
-    right: 0px;
-    width: 20px;
-    border: 0;
-    top: 5px;
-    font-size: 14px;
-    line-height: 1;
-    color: #8492A6;
-}
-
-.seq-input--bg {
-	background: #EFF2F7;
-}
-
-.seq-input:focus,
-.seq-input:active {
-	outline: none;
-}
-
-.ui-dragable-box .sp-replacer {
-	margin-top: 5px;
-	margin-left: 5px;
-}
-
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index 6005bdb56..b8506fe54 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -8,21 +8,30 @@
   {%- endassets -%}
 {% endblock %}
 
-{% macro labelformfields(lform, subform=false) %}
+{% macro labelformfields(lform, subform=false, empty=false) %}
   {%- if subform %}
-      <div class="card">
-          <div class="card__body">
-          {{ lform.hidden_tag() }}
+    <div class="ui-dragable-box" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true">
+      {{ lform.hidden_tag() }}
   {%- endif %}
   {{ renderfield(lform.icon_emoji, css_class="emojipicker") }}
   {%- for error in lform.icon_emoji.errors %}
     <div><p class="mui-form__error">{{ error }}</p></div>
   {%- endfor %}
-  {{ renderfield(lform.title, autofocus=true, css_class="label-title") }}
+  {%- if not empty %}
+    {{ renderfield(lform.title, autofocus=true, css_class="label-title") }}
+  {%- else -%}
+    {{ renderfield(lform.title, autofocus=true, css_class="label-title--close") }}
+  {%- endif %}
   {%- for error in lform.title.errors %}
     <div><p class="mui-form__error">{{ error }}</p></div>
   {%- endfor %}
-  {%- if subform %}</div></div>{%- endif %}
+    {%- if empty %}<button class="mui-btn--nostyle js-remove-sublabel-form remove-btn"><i class="material-icons mui--text-body1">close</i></button>{%- endif %}
+    <!-- Add archive button for existing sublabels -->
+  {%- if subform %}
+    <i class="material-icons mui--text-body1 drag-icon">drag_handle</i>
+    <input name="lform-seq" value="{{ lform.seq }}" readonly class="seq-input">
+    </div>
+  {%- endif %}
 {% endmacro %}
 
 {% block content %}
@@ -35,7 +44,7 @@
   {%- if message %}
     <p class="form-message">{{ message }}</p>
   {%- endif %}
-  <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins hg-form">
+  <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins mui-form--smaller ">
     {{ form.hidden_tag() }}
     {{ labelformfields(form) }}
     <div id="child-form">
@@ -45,8 +54,12 @@
         {% endfor %}
       {% endif %}
     </div>
-    <p><button class="mui-btn mui-btn--raised mui-btn--accent" id="add-label-btn">+ Add Sublabel</button></p>
-    {{ renderfield(form.required, css_class="mui--hide js-required-field") }}
+    <div><button class="mui-btn mui-btn--raised mui-btn--accent" id="add-sublabel-form"><i class="material-icons mui--align-middle mui--text-subhead">add</i> Add Sublabel</button></div>
+    {%- if subforms|length > 0 %}
+      {{ renderfield(form.required) }}
+    {%- else -%}
+      {{ renderfield(form.required, css_class="mui--hide js-required-field") }}
+    {% endif %}
     {%- for error in form.required.errors %}
       <div><p class="mui-form__error">{{ error }}</p></div>
     {%- endfor %}
@@ -67,6 +80,9 @@
   {% assets "js_emojionearea" -%}
     <script type="text/javascript" src="{{ ASSET_URL }}"></script>
   {%- endassets -%}
+  {% assets "js_sortable" -%}
+    <script type="text/javascript" src="{{ ASSET_URL }}"></script>
+  {%- endassets -%}
   <script type="text/javascript">
     $(function() {
       function initEmojiPicker() {
@@ -76,16 +92,34 @@
           standalone: true
         });
       }
-      $('#add-label-btn').click(function(event) {
+      function applySortable() {
+        $(this).sortable({
+          placeholder: $(this).data('drag-placeholder'),
+          cursor: 'move',
+          update: function() {
+              $(this).children().each(function(index) {
+                $(this).children('input[name$="seq"]').val(++index);
+              });
+          }
+        });
+      }
+      $('#add-sublabel-form').click(function(event) {
         event.preventDefault();
-        var formHtml = {{ labelformfields(emptysubform, subform=true)|tojson|safe }};
+        var formHtml = {{ labelformfields(emptysubform, subform=true, empty=true)|tojson|safe }};
         $('#child-form').append(formHtml);
         activate_widgets();
         initEmojiPicker();
         $('.js-required-field').removeClass('mui--hide');
         $('.js-required-field input').prop('checked', true);
+        $("#child-form").each(applySortable);
+      });
+      $('#child-form').on('click', '.js-remove-sublabel-form', function() {
+        event.preventDefault();
+        console.log('this', $(this));
+        $(this).parent().remove();
       });
       initEmojiPicker();
+      $("#child-form").each(applySortable);
     });
   </script>
   <script src="{{ 'parsley.js'|ext_asset_url }}" type="text/javascript"></script>
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 25b30bbff..6f24560d6 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -186,6 +186,50 @@
                   <li><a href="{{ proposal.url_for('edit') }}">{% trans %}Edit details{% endtrans %}</a></li>
                   <li><a href="{{ proposal.url_for('delete') }}">{% trans %}Delete{% endtrans %}</a></li>
                 </ul>
+                <select autofocus="" class="notselect field-labels " id="labels" multiple="multiple" name="labels" data-parsley-multiple="labels" data-parsley-id="7288">
+                  {%- for label in proposal.project.labels %}
+                    {%- if label.is_main %}
+                      <optgroup label="{{ label.title }}">
+                        {%- for sublabel in label.options %}
+                          <option value="{{sublabel}}">{{ sublabel.title }}</option>
+                        {%- endfor %}
+                      </optgroup>
+                    {% else -%}
+                      <option value="{{label}}">{{label.title}}</option>
+                    {%- endif %}
+                  {%- endfor %}
+                </select>
+<!--                 <div class="mui-form__controls">
+                  <div class="mui-textfield">
+                    <div class="select-btn js-select-multi"></div>
+                    <div class="dropdown">
+                      <ul>
+                        <li>
+                          <div>
+                            <input type="checkbox" tabindex="-1" readonly=""/>
+                            <span>Sections</span>
+                          </div>
+                          <ul>
+                            <li>
+                              <input type="radio" tabindex="-1" readonly=""/>
+                              <span>Full talk</span>
+                            </li>
+                            <li>
+                              <input type="radio" tabindex="-1" readonly=""/>
+                              <span>Workshop</span>
+                            </li>
+                          </ul>
+                        </li>
+                        <li>
+                          <div>
+                            <input type="checkbox" tabindex="-1" readonly=""/>
+                            <span>Technical level</span>
+                          </div>
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                </div> -->
                 <hr class="mui-divider">
               {%- endif %}
               {% if proposal.current_roles.admin %}

From 43264cf64bd6a35b86ddbac27428510e4df5b466 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Tue, 23 Apr 2019 12:55:01 +0530
Subject: [PATCH 071/125] Add support to reorder main labels

---
 funnel/forms/label.py                    |  7 +-
 funnel/static/css/app.css                | 25 ++++++-
 funnel/static/sass/_card.scss            |  4 ++
 funnel/static/sass/_form.scss            | 28 +++++++-
 funnel/templates/labels.html.jinja2      | 91 +++++++++++++++---------
 funnel/templates/labels_form.html.jinja2 |  4 +-
 funnel/views/label.py                    |  6 +-
 7 files changed, 122 insertions(+), 43 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index a39f16e1b..036530690 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -3,7 +3,7 @@
 from baseframe import __
 import baseframe.forms as forms
 
-__all__ = ['LabelForm', 'LabelOptionForm']
+__all__ = ['LabelForm', 'LabelSeqForm', 'LabelOptionForm']
 
 
 class LabelForm(forms.Form):
@@ -16,7 +16,12 @@ class LabelForm(forms.Form):
         description=__("If checked, only editors and reviewers can apply this label on proposals"))
 
 
+class LabelSeqForm(forms.Form):
+    seq = forms.IntegerField("", widget=forms.HiddenInput())
+
+
 class LabelOptionForm(forms.Form):
     title = forms.StringField(__("Option"),
         validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
     icon_emoji = forms.StringField("")
+    seq = forms.IntegerField("", widget=forms.HiddenInput())
diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index c5738aef4..167580fb0 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -472,11 +472,17 @@ html.touch .collapsible__body--disable {
   margin: 10px 15px;
 }
 
-.ui-dragable-box--header {
+.ui-dragable-box__header {
   padding: 0;
   margin: 10px 0;
 }
 
+.ui-dragable-box--small {
+  margin: 10px 0;
+  max-width: 400px;
+  padding: 0 15px;
+}
+
 .ui-dragable-box--header .collapsible__header {
   margin: 0;
 }
@@ -491,6 +497,19 @@ html.touch .collapsible__body--disable {
   top: 0;
 }
 
+.ui-dragable-box--small .drag-icon {
+  position: absolute;
+  left: 10px;
+  top: 15px;
+}
+.ui-dragable-box--small .ui-dragable-box__heading {
+  margin-left: 15px;
+  margin-top: 15px;
+}
+.ui-dragable-box--small .ui-dragable-box__list {
+  padding-left: 2em;
+}
+
 .ui-dragable-box:hover {
   cursor: pointer;
   box-shadow: 0 1px 3px rgba(158, 158, 158, 0.12), 0 1px 2px rgba(158, 158, 158, 0.24);
@@ -651,6 +670,10 @@ html.touch .collapsible__body--disable {
   text-decoration: none;
 }
 
+.card--small {
+  max-width: 400px;
+}
+
 .profile-details {
   display: flex;
   align-items: center;
diff --git a/funnel/static/sass/_card.scss b/funnel/static/sass/_card.scss
index d3148deac..f7e4b7c0a 100644
--- a/funnel/static/sass/_card.scss
+++ b/funnel/static/sass/_card.scss
@@ -112,3 +112,7 @@
   }
 }
 
+.card--small {
+  max-width: 400px;
+}
+
diff --git a/funnel/static/sass/_form.scss b/funnel/static/sass/_form.scss
index 5d8b96523..620ca58ae 100644
--- a/funnel/static/sass/_form.scss
+++ b/funnel/static/sass/_form.scss
@@ -88,11 +88,17 @@
   margin: 10px 15px;
 }
 
-.ui-dragable-box--header {
+.ui-dragable-box__header {
   padding: 0;
   margin: 10px 0;
 }
 
+.ui-dragable-box--small {
+  margin: 10px 0;
+  max-width: 400px;
+  padding: 0 15px;
+}
+
 .ui-dragable-box--header .collapsible__header {
   margin: 0;
 }
@@ -104,7 +110,25 @@
 .ui-dragable-box .drag-icon {
   position: absolute;
   left: 5px;
-    top: 0;
+  top: 0;
+}
+
+.ui-dragable-box--small {
+
+  .drag-icon {
+    position: absolute;
+    left: 10px;
+    top: 15px;
+  }
+  
+  .ui-dragable-box__heading {
+    margin-left: 15px;
+    margin-top: 15px;
+  }
+
+  .ui-dragable-box__list {
+    padding-left: 2em;
+  }
 }
 
 .ui-dragable-box:hover {
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 2d1315b92..c567dcb25 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -1,4 +1,5 @@
 {% extends "layout.html.jinja2" %}
+{% from "baseframe/forms.html.jinja2" import renderfield %}
 {% block title %}{% trans %}Labels{% endtrans %} &ndash; {{ project.title }}{% endblock %}
 
 {% block top_title %}
@@ -7,46 +8,66 @@
 {% endblock %}
 
 {% block contentwrapper %}
-  <div class="grid">
+  <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins">
+    {{ form.hidden_tag() }}
     {%- for label in labels %}
-      <div class="grid__col-xs-12 grid__col-sm-4">
-        <div class="card">
-          {% if label.has_options %}
-            <div class="card__body card__body--minheight mui--text-subhead">
-              <h3>{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
-              <ul class="mui-list--aligned mui-list--unstyled">
-                {%- for sublabel in label.options %}
-                  <li>
-                    <span class="mui--text-subhead"><strong>{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</strong></span>
-                  </li>
-                {% else %}
-                  <li class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></li>
-                {%- endfor %}
-              </ol>
-            </div>
-            <div class="mui-divider"></div>
-          {% else %}
-            <div class="card__body card__body--minheight mui--text-subhead">
-              <h3>{{ label.title }}</h3>
-            </div>
-            <div class="mui-divider"></div>
-          {% endif %}
-          <div class="card__footer">
-            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit label{% endtrans %}</a>
-            <!-- <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-href="" title="{% trans %}Add label{% endtrans %}" id="add-label-btn">{% trans %}Archive{% endtrans %}</a> -->
-          </div>
+      <div class="ui-dragable-box ui-dragable-box--small" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
+        {% if label.has_options %}
+          <i class="material-icons mui--text-body1 drag-icon">drag_handle</i>
+          <input name="label-seq" value="{{ label.seq }}" type="hidden" class="seq-input">
+          <h3 class="mui--text-subhead ui-dragable-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
+          <ul class="mui-list--aligned mui-list--unstyled ui-dragable-box__list">
+            {%- for sublabel in label.options %}
+              <li>
+                <span class="mui--text-subhead"><strong>{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</strong></span>
+              </li>
+            {% else %}
+              <li class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></li>
+            {%- endfor %}
+          </ul>
+        {% else %}
+          <h3 class="mui--text-subhead ui-dragable-box__heading">{{ label.title }}</h3>
+        {% endif %}
+        <div>
+          <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit label{% endtrans %}</a>
+          <!-- <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-href="" title="{% trans %}Add label{% endtrans %}" id="add-label-btn">{% trans %}Archive{% endtrans %}</a> -->
         </div>
       </div>
     {%- endfor %}
-    <div class="grid__col-xs-12 grid__col-sm-4">
-      <div class="clickable-card card" data-href="{{ project.url_for('new_label') }}" title="New label">
-        <div class="card__body card__body--new mui--bg-accent">
-          <p class="mui--text-headline mui--text-center">
-            <a class="new-btn mui--text-dark " href="{{ project.url_for('new_label') }}" title="New labelset" data-action="New labelset"><span>+</span><br><span>Add new label</span></a>
-          </p>
-        </div>
+    <div class="mui-form form-actions clearfix">
+      <div>
+        <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary" value="reject">Save</button>
+        <span class="loading mui--hide"></span>
       </div>
     </div>
+  </form>
+  <div class="clickable-card card card--small" data-href="{{ project.url_for('new_label') }}" title="New label">
+    <div class="card__body card__body--new mui--bg-accent">
+      <p class="mui--text-headline mui--text-center">
+        <a class="new-btn mui--text-dark " href="{{ project.url_for('new_label') }}" title="New labelset" data-action="New labelset"><span>+</span><br><span>Add new label</span></a>
+      </p>
+    </div>
   </div>
-</div>
+{% endblock %}
+
+{% block footerscripts %}
+  {% assets "js_sortable" -%}
+    <script type="text/javascript" src="{{ ASSET_URL }}"></script>
+  {%- endassets -%}
+  <script type="text/javascript">
+    $(function() {
+      function applySortable() {
+        $(this).sortable({
+          placeholder: $(this).data('drag-placeholder'),
+          cursor: 'move',
+          update: function() {
+              $(this).children().each(function(index) {
+                $(this).children('input[name$="seq"]').val(++index);
+              });
+          }
+        });
+      }
+      $("#label-form").each(applySortable);
+    });
+  </script>
 {% endblock %}
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index b8506fe54..724c9275e 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -1,5 +1,5 @@
 {% extends "formlayout.html.jinja2" %}
-{% from "baseframe/forms.html.jinja2" import renderfield, rendersubmit, ajaxform %}
+{% from "baseframe/forms.html.jinja2" import renderfield %}
 {% block title %}{{ title }}{% endblock %}
 
 {% block pageheaders %}
@@ -29,7 +29,7 @@
     <!-- Add archive button for existing sublabels -->
   {%- if subform %}
     <i class="material-icons mui--text-body1 drag-icon">drag_handle</i>
-    <input name="lform-seq" value="{{ lform.seq }}" readonly class="seq-input">
+    {{ renderfield(lform.seq, css_class="seq-input") }}
     </div>
   {%- endif %}
 {% endmacro %}
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 9397bf78f..564ca91b5 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -7,7 +7,7 @@
 
 from .. import app, funnelapp, lastuser
 from ..models import Label, db, Project, Profile
-from ..forms import LabelForm, LabelOptionForm
+from ..forms import LabelForm, LabelSeqForm, LabelOptionForm
 from .mixins import ProjectViewMixin
 from .decorators import legacy_redirect
 
@@ -21,7 +21,9 @@ class ProjectLabelView(ProjectViewMixin, UrlForView, ModelView):
     @lastuser.requires_login
     @requires_permission('edit_project')
     def labels(self):
-        return dict(project=self.obj, labels=self.obj.labels)
+        # TODO: Update form to save sequence of main labels
+        form = LabelSeqForm(model=Label, parent=self.obj.parent)
+        return dict(project=self.obj, labels=self.obj.labels, form=form)
 
     @route('new', methods=['GET', 'POST'])
     @lastuser.requires_login

From d0f044c050dada66feeaf45784bae94bf8eb9a72 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 23 Apr 2019 15:46:25 +0530
Subject: [PATCH 072/125] added label form for admin panel and added id to
 labelform

---
 funnel/forms/label.py    |  2 ++
 funnel/forms/proposal.py | 34 +++++++++++++++++++++++++---------
 funnel/views/proposal.py |  8 ++++++--
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 036530690..b5d5e6cb8 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -7,6 +7,7 @@
 
 
 class LabelForm(forms.Form):
+    id = forms.IntegerField("", widget=forms.HiddenInput())
     title = forms.StringField(__("Label"),
         validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
     icon_emoji = forms.StringField("")
@@ -21,6 +22,7 @@ class LabelSeqForm(forms.Form):
 
 
 class LabelOptionForm(forms.Form):
+    id = forms.IntegerField("", widget=forms.HiddenInput())
     title = forms.StringField(__("Option"),
         validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
     icon_emoji = forms.StringField("")
diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 89de6841c..984da9401 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -7,10 +7,10 @@
 from ..models import Project, Profile
 
 __all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm', 'ProposalLabelsForm',
-    'ProposalMoveForm']
+    'ProposalMoveForm', 'ProposalLabelsAdminForm']
 
 
-def proposal_label_form(project, proposal):
+def proposal_label_form(project, proposal, for_admin=False):
     """
     Returns a label form for the given project and proposal.
     """
@@ -18,13 +18,22 @@ class ProposalLabelForm(forms.Form):
         pass
 
     for label in project.labels:
-        if label.has_options and not label.archived and not label.restricted:
-            setattr(ProposalLabelForm, label.name, forms.RadioField(
-                label.title,
-                description=label.description,
-                validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
-                choices=[(option.name, option.title) for option in label.options if not option.archived]
-            ))
+        if for_admin:
+            if not label.archived and (label.restricted or not label.has_options):
+                setattr(ProposalLabelForm, label.name, forms.RadioField(
+                    label.title,
+                    description=label.description,
+                    validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
+                    choices=[(option.name, option.title) for option in label.options if not option.archived]
+                ))
+        else:
+            if label.has_options and not label.archived and not label.restricted:
+                setattr(ProposalLabelForm, label.name, forms.RadioField(
+                    label.title,
+                    description=label.description,
+                    validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
+                    choices=[(option.name, option.title) for option in label.options if not option.archived]
+                ))
 
     return ProposalLabelForm(obj=proposal.formlabels if proposal else None, meta={'csrf': False})
 
@@ -40,6 +49,13 @@ def set_queries(self):
         self.formlabels.form = proposal_label_form(project=self.edit_parent, proposal=self.edit_obj)
 
 
+class ProposalLabelsAdminForm(forms.Form):
+    formlabels = forms.FormField(forms.Form, __("Labels"))
+
+    def set_queries(self):
+        self.formlabels.form = proposal_label_form(project=self.edit_parent, proposal=self.edit_obj, for_admin=True)
+
+
 class ProposalForm(forms.Form):
     speaking = forms.RadioField(__("Are you speaking?"), coerce=int,
         choices=[(1, __(u"I will be speaking")),
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index eeb20c0b2..0e96e55fd 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -13,7 +13,8 @@
 from .. import app, funnelapp, lastuser
 from ..models import db, Proposal, Comment
 from ..forms import (ProposalForm, CommentForm, DeleteCommentForm,
-    ProposalTransitionForm, ProposalMoveForm, ProposalLabelsForm)
+    ProposalTransitionForm, ProposalMoveForm, ProposalLabelsForm,
+    ProposalLabelsAdminForm)
 from .mixins import ProjectViewMixin, ProposalViewMixin
 from .decorators import legacy_redirect
 
@@ -151,11 +152,14 @@ def view(self):
         if 'move_to' in self.obj.current_access():
             proposal_move_form = ProposalMoveForm()
 
+        proposal_label_admin_form = ProposalLabelsAdminForm(model=Proposal, obj=self.obj, parent=self.obj.project)
+
         return dict(project=self.obj.project, proposal=self.obj,
             comments=comments, commentform=commentform, delcommentform=delcommentform,
             links=links, transition_form=transition_form, proposal_move_form=proposal_move_form,
             part_a=self.obj.project.proposal_part_a.get('title', 'Objective'),
-            part_b=self.obj.project.proposal_part_b.get('title', 'Description'), csrf_form=Form())
+            part_b=self.obj.project.proposal_part_b.get('title', 'Description'), csrf_form=Form(),
+            proposal_label_admin_form=proposal_label_admin_form)
 
     @route('json')
     @requires_permission('view')

From 4cbc4c64adaf538b029c1cd2ff717b5ba8f913a7 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 23 Apr 2019 16:29:52 +0530
Subject: [PATCH 073/125] id field is option for labelform

---
 funnel/forms/label.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index b5d5e6cb8..87d4b8862 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -7,7 +7,7 @@
 
 
 class LabelForm(forms.Form):
-    id = forms.IntegerField("", widget=forms.HiddenInput())
+    id = forms.IntegerField("", widget=forms.HiddenInput(), validators=[forms.validators.Optional()])
     title = forms.StringField(__("Label"),
         validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
     icon_emoji = forms.StringField("")

From 6949eba2a5378da80e788546b187d86ab9d60e76 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 23 Apr 2019 16:31:13 +0530
Subject: [PATCH 074/125] id is optional for options form

---
 funnel/forms/label.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 87d4b8862..485da0b22 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -22,7 +22,7 @@ class LabelSeqForm(forms.Form):
 
 
 class LabelOptionForm(forms.Form):
-    id = forms.IntegerField("", widget=forms.HiddenInput())
+    id = forms.IntegerField("", widget=forms.HiddenInput(), validators=[forms.validators.Optional()])
     title = forms.StringField(__("Option"),
         validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
     icon_emoji = forms.StringField("")

From b59a8b581086d0298187512ee053a0f0fe8c21e9 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Tue, 23 Apr 2019 16:07:18 +0530
Subject: [PATCH 075/125] Layout of manage label page

---
 funnel/static/css/app.css           |  1 +
 funnel/static/sass/_card.scss       |  1 +
 funnel/templates/labels.html.jinja2 | 74 ++++++++++++++++-------------
 3 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 167580fb0..8f587cba2 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -672,6 +672,7 @@ html.touch .collapsible__body--disable {
 
 .card--small {
   max-width: 400px;
+  margin-top: 10px;
 }
 
 .profile-details {
diff --git a/funnel/static/sass/_card.scss b/funnel/static/sass/_card.scss
index f7e4b7c0a..8d5e27574 100644
--- a/funnel/static/sass/_card.scss
+++ b/funnel/static/sass/_card.scss
@@ -114,5 +114,6 @@
 
 .card--small {
   max-width: 400px;
+  margin-top: 10px;
 }
 
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index c567dcb25..d7f2f4fb5 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -8,46 +8,52 @@
 {% endblock %}
 
 {% block contentwrapper %}
-  <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins">
-    {{ form.hidden_tag() }}
-    {%- for label in labels %}
-      <div class="ui-dragable-box ui-dragable-box--small" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
-        {% if label.has_options %}
-          <i class="material-icons mui--text-body1 drag-icon">drag_handle</i>
-          <input name="label-seq" value="{{ label.seq }}" type="hidden" class="seq-input">
-          <h3 class="mui--text-subhead ui-dragable-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
-          <ul class="mui-list--aligned mui-list--unstyled ui-dragable-box__list">
-            {%- for sublabel in label.options %}
-              <li>
-                <span class="mui--text-subhead"><strong>{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</strong></span>
-              </li>
-            {% else %}
-              <li class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></li>
-            {%- endfor %}
-          </ul>
-        {% else %}
-          <h3 class="mui--text-subhead ui-dragable-box__heading">{{ label.title }}</h3>
-        {% endif %}
+<div class="grid">
+  <div class="grid__col-xs-12 grid__col-md-6">
+    <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form">
+      {{ form.hidden_tag() }}
+      {%- for label in labels %}
+        <div class="ui-dragable-box ui-dragable-box--small" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
+          {% if label.has_options %}
+            <i class="material-icons mui--text-body1 drag-icon">drag_handle</i>
+            <input name="label-seq" value="{{ label.seq }}" type="hidden" class="seq-input">
+            <h3 class="mui--text-subhead ui-dragable-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
+            <ul class="mui-list--aligned mui-list--unstyled ui-dragable-box__list">
+              {%- for sublabel in label.options %}
+                <li>
+                  <span class="mui--text-subhead"><strong>{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</strong></span>
+                </li>
+              {% else %}
+                <li class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></li>
+              {%- endfor %}
+            </ul>
+          {% else %}
+            <h3 class="mui--text-subhead ui-dragable-box__heading">{{ label.title }}</h3>
+          {% endif %}
+          <div>
+            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit label{% endtrans %}</a>
+            <!-- <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-href="" title="{% trans %}Add label{% endtrans %}" id="add-label-btn">{% trans %}Archive{% endtrans %}</a> -->
+          </div>
+        </div>
+      {%- endfor %}
+      <div class="mui-form form-actions clearfix">
         <div>
-          <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit label{% endtrans %}</a>
-          <!-- <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-href="" title="{% trans %}Add label{% endtrans %}" id="add-label-btn">{% trans %}Archive{% endtrans %}</a> -->
+          <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary" value="reject">Save</button>
+          <span class="loading mui--hide"></span>
         </div>
       </div>
-    {%- endfor %}
-    <div class="mui-form form-actions clearfix">
-      <div>
-        <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary" value="reject">Save</button>
-        <span class="loading mui--hide"></span>
+    </form>
+  </div>
+  <div class="grid__col-xs-12 grid__col-md-6">
+    <div class="clickable-card card card--small" data-href="{{ project.url_for('new_label') }}" title="New label">
+      <div class="card__body card__body--new mui--bg-accent">
+        <p class="mui--text-headline mui--text-center">
+          <a class="new-btn mui--text-dark " href="{{ project.url_for('new_label') }}" title="New labelset" data-action="New labelset"><span>+</span><br><span>Add new label</span></a>
+        </p>
       </div>
     </div>
-  </form>
-  <div class="clickable-card card card--small" data-href="{{ project.url_for('new_label') }}" title="New label">
-    <div class="card__body card__body--new mui--bg-accent">
-      <p class="mui--text-headline mui--text-center">
-        <a class="new-btn mui--text-dark " href="{{ project.url_for('new_label') }}" title="New labelset" data-action="New labelset"><span>+</span><br><span>Add new label</span></a>
-      </p>
-    </div>
   </div>
+</div>
 {% endblock %}
 
 {% block footerscripts %}

From 294883832b7a1ae3e65b17c28d0d3a937b77bbd6 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Tue, 23 Apr 2019 16:52:20 +0530
Subject: [PATCH 076/125] Add proposal_label_admin_form (WIP)

---
 funnel/templates/proposal.html.jinja2 | 47 ++-------------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 6f24560d6..ed384a4e0 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -186,50 +186,6 @@
                   <li><a href="{{ proposal.url_for('edit') }}">{% trans %}Edit details{% endtrans %}</a></li>
                   <li><a href="{{ proposal.url_for('delete') }}">{% trans %}Delete{% endtrans %}</a></li>
                 </ul>
-                <select autofocus="" class="notselect field-labels " id="labels" multiple="multiple" name="labels" data-parsley-multiple="labels" data-parsley-id="7288">
-                  {%- for label in proposal.project.labels %}
-                    {%- if label.is_main %}
-                      <optgroup label="{{ label.title }}">
-                        {%- for sublabel in label.options %}
-                          <option value="{{sublabel}}">{{ sublabel.title }}</option>
-                        {%- endfor %}
-                      </optgroup>
-                    {% else -%}
-                      <option value="{{label}}">{{label.title}}</option>
-                    {%- endif %}
-                  {%- endfor %}
-                </select>
-<!--                 <div class="mui-form__controls">
-                  <div class="mui-textfield">
-                    <div class="select-btn js-select-multi"></div>
-                    <div class="dropdown">
-                      <ul>
-                        <li>
-                          <div>
-                            <input type="checkbox" tabindex="-1" readonly=""/>
-                            <span>Sections</span>
-                          </div>
-                          <ul>
-                            <li>
-                              <input type="radio" tabindex="-1" readonly=""/>
-                              <span>Full talk</span>
-                            </li>
-                            <li>
-                              <input type="radio" tabindex="-1" readonly=""/>
-                              <span>Workshop</span>
-                            </li>
-                          </ul>
-                        </li>
-                        <li>
-                          <div>
-                            <input type="checkbox" tabindex="-1" readonly=""/>
-                            <span>Technical level</span>
-                          </div>
-                        </li>
-                      </ul>
-                    </div>
-                  </div>
-                </div> -->
                 <hr class="mui-divider">
               {%- endif %}
               {% if proposal.current_roles.admin %}
@@ -247,6 +203,9 @@
                   </p>
                 </form>
               {% endif %}
+              {%- if proposal_label_admin_form %}
+                {{ renderform(proposal_label_admin_form, 'add-label', action=proposal.url_for('edit_labels'), submit="Move", style='horiz') }}
+              {%- endif %}
             </div>
           </div>
         {% endif %}

From 1191e7528d316658c3c15f107b5153a8e85bb3ed Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 23 Apr 2019 17:10:40 +0530
Subject: [PATCH 077/125] showing booleanfield for boolean labels

---
 funnel/forms/proposal.py              | 24 ++++++++++++------------
 funnel/templates/proposal.html.jinja2 |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 984da9401..68f989e70 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -18,22 +18,22 @@ class ProposalLabelForm(forms.Form):
         pass
 
     for label in project.labels:
+        field_kwargs = dict(
+            description=label.description,
+            validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
+        )
+        if label.has_options:
+            FieldType = forms.RadioField
+            field_kwargs['choices'] = [(option.name, option.title) for option in label.options if not option.archived]
+        else:
+            FieldType = forms.BooleanField
+
         if for_admin:
             if not label.archived and (label.restricted or not label.has_options):
-                setattr(ProposalLabelForm, label.name, forms.RadioField(
-                    label.title,
-                    description=label.description,
-                    validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
-                    choices=[(option.name, option.title) for option in label.options if not option.archived]
-                ))
+                setattr(ProposalLabelForm, label.name, FieldType(label.title, **field_kwargs))
         else:
             if label.has_options and not label.archived and not label.restricted:
-                setattr(ProposalLabelForm, label.name, forms.RadioField(
-                    label.title,
-                    description=label.description,
-                    validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
-                    choices=[(option.name, option.title) for option in label.options if not option.archived]
-                ))
+                setattr(ProposalLabelForm, label.name, FieldType(label.title, **field_kwargs))
 
     return ProposalLabelForm(obj=proposal.formlabels if proposal else None, meta={'csrf': False})
 
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index ed384a4e0..ede0b70b3 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -204,7 +204,7 @@
                 </form>
               {% endif %}
               {%- if proposal_label_admin_form %}
-                {{ renderform(proposal_label_admin_form, 'add-label', action=proposal.url_for('edit_labels'), submit="Move", style='horiz') }}
+                {{ renderform(proposal_label_admin_form, 'add-label', action=proposal.url_for('edit_labels'), submit="Save", style='horiz') }}
               {%- endif %}
             </div>
           </div>

From f506c370c62264307bdb6cef88d5a60f58f271f1 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 23 Apr 2019 17:16:17 +0530
Subject: [PATCH 078/125] showing emoji in front of label title in widget

---
 funnel/forms/proposal.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 68f989e70..085f72d3c 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -18,10 +18,11 @@ class ProposalLabelForm(forms.Form):
         pass
 
     for label in project.labels:
-        field_kwargs = dict(
-            description=label.description,
-            validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
-        )
+        field_kwargs = {
+            'label': label.icon_emoji + " " + label.title if label.icon_emoji is not None else label.title,
+            'description': label.description,
+            'validators': [forms.validators.DataRequired(__("Please select one"))] if label.required else [],
+        }
         if label.has_options:
             FieldType = forms.RadioField
             field_kwargs['choices'] = [(option.name, option.title) for option in label.options if not option.archived]
@@ -30,10 +31,10 @@ class ProposalLabelForm(forms.Form):
 
         if for_admin:
             if not label.archived and (label.restricted or not label.has_options):
-                setattr(ProposalLabelForm, label.name, FieldType(label.title, **field_kwargs))
+                setattr(ProposalLabelForm, label.name, FieldType(**field_kwargs))
         else:
             if label.has_options and not label.archived and not label.restricted:
-                setattr(ProposalLabelForm, label.name, FieldType(label.title, **field_kwargs))
+                setattr(ProposalLabelForm, label.name, FieldType(**field_kwargs))
 
     return ProposalLabelForm(obj=proposal.formlabels if proposal else None, meta={'csrf': False})
 

From 3012115bc127432d50db05fd9c9f804e7a3635b1 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 23 Apr 2019 17:26:40 +0530
Subject: [PATCH 079/125] saving labels in admin panel

---
 funnel/views/proposal.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index 0e96e55fd..356a4b6f2 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -253,18 +253,19 @@ def schedule(self):
         from .session import session_form
         return session_form(self.obj.project, proposal=self.obj)
 
-    @route('labels', methods=['GET', 'POST'])
+    @route('labels', methods=['POST'])
     @lastuser.requires_login
     @requires_permission('admin')
     def edit_labels(self):
-        form = ProposalLabelsForm(model=Proposal, obj=self.obj, parent=self.obj.project)
+        form = ProposalLabelsAdminForm(model=Proposal, obj=self.obj, parent=self.obj.project)
         if form.validate_on_submit():
             form.populate_obj(self.obj)
             db.session.commit()
             flash(_("Labels have been saved for this proposal."), 'info')
-            return redirect(self.obj.url_for(), 303)
-        return render_form(form=form, submit=_("Save changes"),
-            title=_("Edit labels for '{}'".format(self.obj.title)))
+        else:
+            flash(_("Labels could not be saved for this proposal."), 'error')
+        return redirect(self.obj.url_for(), 303)
+
 
 
 @route('/<project>/<url_id_name>', subdomain='<profile>')

From 12e970f70e61c2379f9e21ad5e472ecfaf7fb3d7 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Wed, 24 Apr 2019 10:34:32 +0530
Subject: [PATCH 080/125] redirecting to labels page if there is an error in
 proposals page label form

---
 funnel/views/label.py    | 4 +---
 funnel/views/proposal.py | 7 ++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index 564ca91b5..b48d74ce4 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -113,8 +113,6 @@ def edit(self):
                     subforms.append(LabelOptionForm(obj=subl, parent=self.obj.project))
 
         if form.validate_on_submit():
-            form.populate_obj(self.obj)
-
             idlist = request.values.getlist('id')
             titlelist = request.values.getlist('title')
             emojilist = request.values.getlist('icon_emoji')
@@ -145,7 +143,7 @@ def edit(self):
                         self.obj.project.labels.append(subl)
                         self.obj.options.append(subl)
                         db.session.add(subl)
-
+                form.populate_obj(self.obj)
             db.session.commit()
             return redirect(self.obj.project.url_for('labels'), code=303)
         return dict(title="Edit label", form=form, subforms=subforms, emptysubform=emptysubform, project=self.obj.project)
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index 356a4b6f2..c6935c914 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -253,7 +253,7 @@ def schedule(self):
         from .session import session_form
         return session_form(self.obj.project, proposal=self.obj)
 
-    @route('labels', methods=['POST'])
+    @route('labels', methods=['GET', 'POST'])
     @lastuser.requires_login
     @requires_permission('admin')
     def edit_labels(self):
@@ -262,10 +262,11 @@ def edit_labels(self):
             form.populate_obj(self.obj)
             db.session.commit()
             flash(_("Labels have been saved for this proposal."), 'info')
+            return redirect(self.obj.url_for(), 303)
         else:
             flash(_("Labels could not be saved for this proposal."), 'error')
-        return redirect(self.obj.url_for(), 303)
-
+            return render_form(form, submit=_("Save changes"),
+                title=_("Edit labels for '{}'").format(self.obj.title))
 
 
 @route('/<project>/<url_id_name>', subdomain='<profile>')

From 8bdb16a16bc7a9d53dd5713f580eb66355980d0e Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Wed, 24 Apr 2019 11:06:03 +0530
Subject: [PATCH 081/125] Add label widget

---
 funnel/static/css/app.css             |  90 ++++++++++++++++++++++
 funnel/static/sass/_proposal.scss     | 105 ++++++++++++++++++++++++++
 funnel/templates/proposal.html.jinja2 |  40 +++++++++-
 3 files changed, 233 insertions(+), 2 deletions(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 8f587cba2..e4438498b 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -1191,6 +1191,96 @@ html.touch .collapsible__body--disable {
   text-decoration: none;
 }
 
+.selected-label {
+  border-bottom: 1px solid #ccc;
+  width: 100%;
+}
+
+.add-label-form .label-dropdown-wrapper {
+  position: relative;
+}
+.add-label-form fieldset {
+  border: none;
+  position: absolute;
+  top: -500px;
+  z-index: -1;
+  left: 0px;
+  width: 100%;
+  margin: 0px;
+  padding: 10px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+  background-color: white;
+  margin: 0;
+  -webkit-transition: top 0.25s linear, z-index 0.1s step-start;
+  -moz-transition: top 0.25s linear, z-index 0.1s step-start;
+  -ms-transition: top 0.25s linear, z-index 0.1s step-start;
+  -o-transition: top 0.25s linear, z-index 0.1s step-start;
+}
+.add-label-form fieldset legend {
+  display: none;
+}
+.add-label-form fieldset.active {
+  top: 0;
+  z-index: 1;
+  -webkit-transition: top 0.25s linear, z-index 0.25s step-end;
+  -moz-transition: top 0.25s linear, z-index 0.25s step-end;
+  -ms-transition: top 0.25s linear, z-index 0.25s step-end;
+  -o-transition: top 0.25s linear, z-index 0.25s step-end;
+  transition: top 0.25s linear, z-index 0.25s step-end;
+}
+.add-label-form .listwidget .mui-textfield {
+  margin-bottom: 0;
+  padding-top: 0;
+}
+.add-label-form .listwidget .mui-form__label {
+  font-size: 14px;
+  line-height: 24px;
+  overflow: auto;
+  margin: 0;
+  position: relative;
+  color: #1F2D3D;
+  padding-left: 20px;
+}
+.add-label-form .listwidget ul {
+  padding-left: 20px;
+}
+.add-label-form .listwidget .mui-form__label:before,
+.add-label-form .listwidget .mui-form__label:after {
+  position: absolute;
+  content: "";
+  display: inline-block;
+}
+.add-label-form .listwidget .mui-form__label:before {
+  height: 13px;
+  width: 13px;
+  border: 1px solid #ccc;
+  left: 0px;
+  top: 4px;
+  border-radius: 3px;
+}
+.add-label-form .listwidget .mui-form__label:after {
+  height: 4px;
+  width: 8px;
+  border-left: 1.4px solid #fff;
+  border-bottom: 1.2px solid #fff;
+  transform: rotate(-61deg);
+  left: 2px;
+  top: 8px;
+}
+.add-label-form .listwidget .mui-form__label:after {
+  content: none;
+}
+.add-label-form .listwidget .mui-form__label.checked:before {
+  background: #3A99FC;
+  border: none;
+}
+.add-label-form .listwidget .mui-form__label.checked:after {
+  content: "";
+}
+.add-label-form .mui-checkbox {
+  margin-bottom: 0;
+}
+
 .proposal-list-header {
   margin: 1px 0 0;
   width: 100%;
diff --git a/funnel/static/sass/_proposal.scss b/funnel/static/sass/_proposal.scss
index bcf880926..5958d4f01 100644
--- a/funnel/static/sass/_proposal.scss
+++ b/funnel/static/sass/_proposal.scss
@@ -321,3 +321,108 @@
 .label:hover {
   text-decoration: none;
 }
+
+.selected-label {
+  border-bottom: 1px solid #ccc;
+  width: 100%;
+}
+
+.add-label-form {
+  .label-dropdown-wrapper {
+    position: relative;
+  }
+  fieldset {
+    border: none;
+    position: absolute;
+    top: -500px;
+    z-index: -1;
+    left: 0px;
+    width: 100%;
+    margin: 0px;
+    padding: 10px;
+    box-shadow: 0 1px 3px rgba(0,0,0,.12), 0 1px 2px rgba(0,0,0,.24);
+    background-color: white;
+    margin: 0;
+    -webkit-transition: top 0.25s linear, z-index 0.1s step-start;
+    -moz-transition: top 0.25s linear, z-index 0.1s step-start;
+    -ms-transition: top 0.25s linear, z-index 0.1s step-start;
+    -o-transition: top 0.25s linear, z-index 0.1s step-start;
+
+    legend {
+      display: none;
+    }
+  }
+
+  fieldset.active {
+    top: 0;
+    z-index: 1;
+    -webkit-transition: top 0.25s linear, z-index 0.25s step-end;
+    -moz-transition: top 0.25s linear, z-index 0.25s step-end;
+    -ms-transition: top 0.25s linear, z-index 0.25s step-end;
+    -o-transition: top 0.25s linear, z-index 0.25s step-end;
+    transition: top 0.25s linear, z-index 0.25s step-end;
+  }
+
+  .listwidget {
+    .mui-textfield {
+      margin-bottom: 0;
+      padding-top: 0;
+    }
+    .mui-form__label {
+      font-size: 14px;
+      line-height: 24px;
+      overflow: auto;
+      margin: 0;
+      position: relative;
+      color: #1F2D3D;
+      padding-left: 20px;
+    }
+
+    ul {
+      padding-left: 20px;
+    }
+
+    .mui-form__label:before,
+    .mui-form__label:after {
+      position: absolute;
+      content: "";
+      display: inline-block;
+    }
+
+    .mui-form__label:before{
+      height: 13px;
+      width: 13px;
+      border: 1px solid #ccc;
+      left: 0px;
+      top: 4px;
+      border-radius: 3px;
+    }
+
+    .mui-form__label:after {
+      height: 4px;
+      width: 8px;
+      border-left: 1.4px solid #fff;
+      border-bottom: 1.2px solid #fff;
+      transform: rotate(-61deg);
+      left: 2px;
+      top: 8px;
+    }
+
+    .mui-form__label:after {
+      content: none;
+    }
+
+    .mui-form__label.checked:before {
+      background: #3A99FC;
+      border: none;
+    }
+    .mui-form__label.checked:after {
+      content: "";
+    }
+  }
+
+  .mui-checkbox {
+    margin-bottom: 0;
+  }
+    
+}
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index ede0b70b3..ad159bd14 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -1,5 +1,5 @@
 {% extends "layout.html.jinja2" %}
-{% from "baseframe/forms.html.jinja2" import renderfield, renderform %}
+{% from "baseframe/forms.html.jinja2" import renderfield, renderform, rendersubmit %}
 {% from "comments.html.jinja2" import commenttree %}
 {% block title %}{{ proposal.title }} &ndash; {{ project.title }}{% endblock %}
 {% block description %}
@@ -204,7 +204,19 @@
                 </form>
               {% endif %}
               {%- if proposal_label_admin_form %}
-                {{ renderform(proposal_label_admin_form, 'add-label', action=proposal.url_for('edit_labels'), submit="Save", style='horiz') }}
+                <form action="{{ proposal.url_for('view') }}" method="post" class="add-label-form">
+                  {{ proposal_label_admin_form.hidden_tag() }}
+                  <p class="mui--text-title">Labels</p>
+                  <div class="selected-label js-label-select">
+                    {%- for label in proposal.labels %}
+                      <span class="label mui--text-caption mui--text-bold">{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
+                    {%- endfor %}
+                  </div>
+                  <div id="label-dropdown" class="label-dropdown-wrapper">
+                    {{ renderfield(proposal_label_admin_form.formlabels, css_class="label-select-fields") }}
+                  </div>
+                  {{ rendersubmit([(None, "Save", '')]) }}
+                </form>
               {%- endif %}
             </div>
           </div>
@@ -307,6 +319,30 @@
       proposalConfig.videoUrl = proposalConfig.videoWrapper.getAttribute('data-href');
     }
     HasGeek.ProposalInit(proposalConfig);
+
+
+    // TODO: to be moved to proposal.js
+
+    // Show dropdown
+    $('.js-label-select').click(function() {
+      if($('#label-dropdown fieldset').hasClass('active')) {
+        $('#label-dropdown fieldset').removeClass('active');
+      } else {
+        $('#label-dropdown fieldset').addClass('active');
+      }
+    });
+
+    // Add check mark to listwidget label
+    $('.listwidget input[type="radio"]').change(function() {
+      $(this).parents().find('.mui-form__label').addClass('checked');
+    });
+
+    // On load, if the radio has been selected, then check mark the listwidget label
+    $('.listwidget input[type="radio"]').each(function() {
+      if(this.checked) {
+        $(this).parents().find('.mui-form__label').addClass('checked');
+      }
+    });
   });
 </script>
 <script type="text/javascript" src="//apis.google.com/js/plusone.js"></script>

From af72226245d68cbaef9b87e98b08eaf36a4bdc52 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Wed, 24 Apr 2019 12:05:05 +0530
Subject: [PATCH 082/125] Add functionality to add labels widget

---
 funnel/templates/proposal.html.jinja2 | 48 +++++++++++++++++++++------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index ad159bd14..f0fb87525 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -207,9 +207,9 @@
                 <form action="{{ proposal.url_for('view') }}" method="post" class="add-label-form">
                   {{ proposal_label_admin_form.hidden_tag() }}
                   <p class="mui--text-title">Labels</p>
-                  <div class="selected-label js-label-select">
+                  <div class="selected-label" id="label-select">
                     {%- for label in proposal.labels %}
-                      <span class="label mui--text-caption mui--text-bold">{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
+                      <span class="label mui--text-caption mui--text-bold" data-labeltxt="{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}">{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
                     {%- endfor %}
                   </div>
                   <div id="label-dropdown" class="label-dropdown-wrapper">
@@ -322,20 +322,25 @@
 
 
     // TODO: to be moved to proposal.js
-
-    // Show dropdown
-    $('.js-label-select').click(function() {
+    function handleDropdown() {
       if($('#label-dropdown fieldset').hasClass('active')) {
         $('#label-dropdown fieldset').removeClass('active');
       } else {
         $('#label-dropdown fieldset').addClass('active');
       }
-    });
+    }
 
-    // Add check mark to listwidget label
-    $('.listwidget input[type="radio"]').change(function() {
-      $(this).parents().find('.mui-form__label').addClass('checked');
-    });
+    function updateLabels(label, attr, action) {
+      if(action) {
+        if(label !== attr) {
+          $('.label[data-labeltxt="' + attr +  '"]').remove();
+        }
+        var span = '<span class="label mui--text-caption mui--text-bold" data-labeltxt="' + attr + '"">' + label +'</span>';
+        $('#label-select').append(span);
+      } else {
+        $('.label[data-labeltxt="' + attr +  '"]').remove();
+      }
+    }
 
     // On load, if the radio has been selected, then check mark the listwidget label
     $('.listwidget input[type="radio"]').each(function() {
@@ -343,6 +348,29 @@
         $(this).parents().find('.mui-form__label').addClass('checked');
       }
     });
+
+        // Add check mark to listwidget label
+    $('.listwidget input[type="radio"]').change(function() {
+      $(this).parents().find('.mui-form__label').addClass('checked');
+      console.log('radio', this, this.checked);
+      var labelTxt = $(this).parents().find('.mui-form__label').text() + ': ' + $(this).parent().find('label').text();
+      labelTxt = labelTxt.trim();
+      var attr = $(this).parents().find('.mui-form__label').text().trim();
+      updateLabels(labelTxt, attr, this.checked);
+    });
+
+    $('.add-label-form input[type="checkbox"]').change(function() {
+      var labelTxt = $(this).parent('label').text().trim();
+      updateLabels(labelTxt, attr, this.checked);
+    });
+
+    // Open and close dropdown
+    $(document).on('click', function(event) {
+      if ($('#label-select')[0] == event.target || !$(event.target).parents('#label-dropdown').length) {
+        handleDropdown();
+      }
+    });
+    
   });
 </script>
 <script type="text/javascript" src="//apis.google.com/js/plusone.js"></script>

From e0a71e2de49cec2f17663ef1fe3d5c9a7b851271 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Wed, 24 Apr 2019 12:39:35 +0530
Subject: [PATCH 083/125] fixed view for saving labels

---
 funnel/templates/proposal.html.jinja2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index f0fb87525..641e407d9 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -204,7 +204,7 @@
                 </form>
               {% endif %}
               {%- if proposal_label_admin_form %}
-                <form action="{{ proposal.url_for('view') }}" method="post" class="add-label-form">
+                <form action="{{ proposal.url_for('edit_labels') }}" method="post" class="add-label-form">
                   {{ proposal_label_admin_form.hidden_tag() }}
                   <p class="mui--text-title">Labels</p>
                   <div class="selected-label" id="label-select">
@@ -370,7 +370,7 @@
         handleDropdown();
       }
     });
-    
+
   });
 </script>
 <script type="text/javascript" src="//apis.google.com/js/plusone.js"></script>

From df75fd30112b77f7aab53452910c87d3bf83531d Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Wed, 24 Apr 2019 13:43:27 +0530
Subject: [PATCH 084/125]  Fix label widget for checkbox options

---
 funnel/static/css/app.css             | 8 ++++++++
 funnel/static/sass/_proposal.scss     | 9 +++++++++
 funnel/templates/proposal.html.jinja2 | 3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index e4438498b..f956a2a10 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -1194,10 +1194,18 @@ html.touch .collapsible__body--disable {
 .selected-label {
   border-bottom: 1px solid #ccc;
   width: 100%;
+  position: relative;
+}
+.selected-label .material-icons {
+  position: absolute;
+  bottom: 10px;
+  right: 0;
+  color: #888;
 }
 
 .add-label-form .label-dropdown-wrapper {
   position: relative;
+  margin-bottom: 10px;
 }
 .add-label-form fieldset {
   border: none;
diff --git a/funnel/static/sass/_proposal.scss b/funnel/static/sass/_proposal.scss
index 5958d4f01..14b1016b1 100644
--- a/funnel/static/sass/_proposal.scss
+++ b/funnel/static/sass/_proposal.scss
@@ -325,11 +325,20 @@
 .selected-label {
   border-bottom: 1px solid #ccc;
   width: 100%;
+  position: relative;
+
+  .material-icons {
+    position: absolute;
+    bottom: 10px;
+    right: 0;
+    color: #888;
+  }
 }
 
 .add-label-form {
   .label-dropdown-wrapper {
     position: relative;
+    margin-bottom: 10px;
   }
   fieldset {
     border: none;
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 641e407d9..562643399 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -211,6 +211,7 @@
                     {%- for label in proposal.labels %}
                       <span class="label mui--text-caption mui--text-bold" data-labeltxt="{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}">{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
                     {%- endfor %}
+                    <i class="material-icons">arrow_drop_down</i>
                   </div>
                   <div id="label-dropdown" class="label-dropdown-wrapper">
                     {{ renderfield(proposal_label_admin_form.formlabels, css_class="label-select-fields") }}
@@ -361,7 +362,7 @@
 
     $('.add-label-form input[type="checkbox"]').change(function() {
       var labelTxt = $(this).parent('label').text().trim();
-      updateLabels(labelTxt, attr, this.checked);
+      updateLabels(labelTxt, labelTxt, this.checked);
     });
 
     // Open and close dropdown

From 779448b772ad2bd50e1ebf205919a40ae4f1c09d Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Wed, 24 Apr 2019 15:15:20 +0530
Subject: [PATCH 085/125] refactored tests and added more

---
 funnel/forms/proposal.py                |  2 +-
 funnel/models/label.py                  |  4 +++
 funnel/util.py                          |  1 +
 instance/testing.py                     |  1 +
 tests/conftest.py                       | 28 +++++++++++++++--
 tests/test_utils.py                     | 34 ++++++++++++++------
 tests/unit/forms/__init__.py            |  0
 tests/unit/forms/test_label_forms.py    | 41 +++++++++++++++++++++++++
 tests/unit/forms/test_proposal_forms.py | 40 ++++++++++++++++++++++++
 tests/unit/models/test_label.py         |  3 ++
 tests/unit/models/test_profile.py       | 37 +++++++++++-----------
 tests/unit/models/test_project.py       | 33 ++++++++++----------
 12 files changed, 176 insertions(+), 48 deletions(-)
 create mode 100644 tests/unit/forms/__init__.py
 create mode 100644 tests/unit/forms/test_label_forms.py
 create mode 100644 tests/unit/forms/test_proposal_forms.py

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 085f72d3c..7414fecea 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -19,7 +19,7 @@ class ProposalLabelForm(forms.Form):
 
     for label in project.labels:
         field_kwargs = {
-            'label': label.icon_emoji + " " + label.title if label.icon_emoji is not None else label.title,
+            'label': label.form_label_text,
             'description': label.description,
             'validators': [forms.validators.DataRequired(__("Please select one"))] if label.required else [],
         }
diff --git a/funnel/models/label.py b/funnel/models/label.py
index 6f710271e..05d489920 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -84,6 +84,10 @@ class Label(BaseScopedNameMixin, db.Model):
         }
     }
 
+    @property
+    def form_label_text(self):
+        return self.icon_emoji + " " + self.title if self.icon_emoji is not None else self.title
+
     @hybrid_property
     def restricted(self):
         return self.main_label._restricted if self.main_label else self._restricted
diff --git a/funnel/util.py b/funnel/util.py
index 741046c37..7a57562f2 100644
--- a/funnel/util.py
+++ b/funnel/util.py
@@ -73,6 +73,7 @@ def split_name(fullname):
     return unicode(name_splits[0]), unicode(" ".join([s for s in name_splits[1:]]))
 
 
+# TODO: Added tests for this
 def make_qrcode(data):
     """
     Makes a QR code in-memory and returns the raw svg
diff --git a/instance/testing.py b/instance/testing.py
index b7ea3481c..624ab0482 100644
--- a/instance/testing.py
+++ b/instance/testing.py
@@ -10,3 +10,4 @@
 TIMEZONE = 'Asia/Kolkata'
 RQ_LOW_URL = 'redis://localhost:6379/0'
 ASSET_BASE_PATH = "build"
+HASCORE_SERVER = 'https://api.hasgeek.com'
diff --git a/tests/conftest.py b/tests/conftest.py
index 68b79886d..1d4857a3c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -148,13 +148,37 @@ def new_main_label(test_db, new_project):
 
     return main_label_a
 
+
+@pytest.fixture(scope='session')
+def new_main_label_unrestricted(test_db, new_project):
+    main_label_b = Label(
+        title=u"Parent Label B", project=new_project,
+        description=u"A test parent label"
+    )
+    new_project.labels.append(main_label_b)
+    test_db.session.add(main_label_b)
+
+    label_b1 = Label(title=u"Label B1", icon_emoji=u"👍", project=new_project)
+    test_db.session.add(label_b1)
+
+    label_b2 = Label(title=u"Label B2", project=new_project)
+    test_db.session.add(label_b2)
+
+    main_label_b.options.append(label_b1)
+    main_label_b.options.append(label_b2)
+    main_label_b.required = False
+    main_label_b.restricted = False
+    test_db.session.commit()
+
+    return main_label_b
+
 # Scope: function
 # These fixtures are run before every test function,
 # so that changes made to the objects they return in one test function
 # doesn't affect another test function.
 
 
-@pytest.fixture(scope='function')
+@pytest.fixture(scope='class')
 def new_label(test_db, new_project):
     label_b = Label(title=u"Label B", icon_emoji=u"🔟", project=new_project)
     new_project.labels.append(label_b)
@@ -163,7 +187,7 @@ def new_label(test_db, new_project):
     return label_b
 
 
-@pytest.fixture(scope='function')
+@pytest.fixture(scope='class')
 def new_proposal(test_db, new_user, new_project):
     proposal = Proposal(
         user=new_user, speaker=new_user, project=new_project,
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 0b040585e..3323c409f 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,15 +1,29 @@
 # -*- coding: utf-8 -*-
-import unittest
-from funnel.util import extract_twitter_handle
+from flask import current_app
+from funnel.util import (extract_twitter_handle, geonameid_from_location,
+    split_name, format_twitter_handle)
 
 
-class TestUtils(unittest.TestCase):
+class TestUtils(object):
     def test_extract_twitter_handle(self):
         expected = u'shreyas_satish'
-        self.assertEquals(extract_twitter_handle('https://twitter.com/shreyas_satish'), expected)
-        self.assertEquals(extract_twitter_handle('https://twitter.com/shreyas_satish/favorites'), expected)
-        self.assertEquals(extract_twitter_handle('@shreyas_satish'), expected)
-        self.assertEquals(extract_twitter_handle('shreyas_satish'), expected)
-        self.assertEquals(extract_twitter_handle('seriouslylongstring'), None)
-        self.assertEquals(extract_twitter_handle('https://facebook.com/shreyas'), None)
-        self.assertEquals(extract_twitter_handle(''), None)
+        assert extract_twitter_handle('https://twitter.com/shreyas_satish') == expected
+        assert extract_twitter_handle('https://twitter.com/shreyas_satish/favorites') == expected
+        assert extract_twitter_handle('@shreyas_satish') == expected
+        assert extract_twitter_handle('shreyas_satish') == expected
+        assert extract_twitter_handle('seriouslylongstring') is None
+        assert extract_twitter_handle('https://facebook.com/shreyas') is None
+        assert extract_twitter_handle('') is None
+
+    def test_geonameid_from_location(self, test_client):
+        with current_app.test_request_context('/'):
+            location = "Bangalore"
+            expected_geonameid = 1277333
+            assert expected_geonameid in geonameid_from_location(location)
+
+    def test_split_name(self):
+        assert split_name("ABC DEF EFG") == ("ABC", "DEF EFG")
+        assert split_name("") == ""
+
+    def test_format_twitter_handle(self):
+        assert format_twitter_handle("testusername") == "@testusername"
diff --git a/tests/unit/forms/__init__.py b/tests/unit/forms/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/forms/test_label_forms.py b/tests/unit/forms/test_label_forms.py
new file mode 100644
index 000000000..4e9ae773a
--- /dev/null
+++ b/tests/unit/forms/test_label_forms.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+
+from flask import current_app
+from werkzeug.datastructures import MultiDict
+from funnel.forms import LabelForm, LabelSeqForm, LabelOptionForm
+
+
+class TestLabelForms(object):
+    def test_label_form(self, test_client):
+        with current_app.test_request_context('/'):
+            form = LabelForm(MultiDict({
+                'title': u"Test label title",
+                'icon_emoji': u"🔟",
+                'required': False,
+                'restricted': False
+            }), meta={'csrf': False})
+            assert form.validate()
+
+    def test_label_form_invalid(self, test_client):
+        with current_app.test_request_context('/'):
+            form = LabelForm(MultiDict({
+                'icon_emoji': u"🔟",
+                'required': False,
+                'restricted': False
+            }), meta={'csrf': False})
+            # title is required
+            assert not form.validate()
+
+    def test_labelseq_form(self, test_client):
+        with current_app.test_request_context('/'):
+            form = LabelSeqForm(MultiDict({
+                'seq': u"1",
+            }), meta={'csrf': False})
+            assert form.validate()
+
+    def test_labelseq_form_invalid(self, test_client):
+        with current_app.test_request_context('/'):
+            form = LabelSeqForm(MultiDict({
+                'seq': u"",
+            }), meta={'csrf': False})
+            assert not form.validate()
diff --git a/tests/unit/forms/test_proposal_forms.py b/tests/unit/forms/test_proposal_forms.py
new file mode 100644
index 000000000..d03cbbdcd
--- /dev/null
+++ b/tests/unit/forms/test_proposal_forms.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+
+from flask import current_app
+from funnel.forms import ProposalLabelsForm, ProposalLabelsAdminForm
+from funnel.models import Proposal
+
+
+class TestProposalForm(object):
+    def test_proposal_label_admin_form(self, test_client, test_db, new_main_label, new_main_label_unrestricted, new_label, new_proposal):
+        with current_app.test_request_context('/'):
+            assert new_main_label.restricted
+            assert not new_main_label_unrestricted.restricted
+            assert not new_label.restricted
+            assert not new_label.has_options
+
+            label_admin_form = ProposalLabelsAdminForm(obj=new_proposal, model=Proposal, parent=new_proposal.project)
+            # Label form in admin panel shows restricted and optioned labels
+            assert hasattr(label_admin_form.formlabels, new_main_label.name)
+            # Label form in admin panel doesn't show unrestricted labels
+            assert not hasattr(label_admin_form.formlabels, new_main_label_unrestricted.name)
+            # Label form in admin panel shows non-optioned labels
+            assert hasattr(label_admin_form.formlabels, new_label.name)
+            # test the field label text and id
+            assert getattr(label_admin_form.formlabels, new_label.name).label.text == new_label.form_label_text
+            assert getattr(label_admin_form.formlabels, new_label.name).label.field_id == new_label.name
+
+    def test_proposal_label_form(self, test_client, test_db, new_main_label, new_main_label_unrestricted, new_label, new_proposal):
+        with current_app.test_request_context('/'):
+            assert new_main_label.restricted
+            assert not new_main_label_unrestricted.restricted
+            assert not new_label.restricted
+            assert not new_label.has_options
+
+            label_form = ProposalLabelsForm(obj=new_proposal, model=Proposal, parent=new_proposal.project)
+            # Label form in edit page doesn't show restricted labels
+            assert not hasattr(label_form.formlabels, new_main_label.name)
+            # Label form in edit page shows non-restricted optioned labels
+            assert hasattr(label_form.formlabels, new_main_label_unrestricted.name)
+            # Label form in edit page doesn't show non-optioned labels
+            assert not hasattr(label_form.formlabels, new_label.name)
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index 02b09cfbb..3778f727b 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -49,3 +49,6 @@ def test_label_flags(self, new_main_label, new_label):
         restricted_labels = Label.query.filter(Label.restricted == True).all()
         assert new_main_label in restricted_labels
         assert new_label not in restricted_labels
+
+    # TODO: test label icon property
+    # TODO: test that label options complain if you set restricted flag
diff --git a/tests/unit/models/test_profile.py b/tests/unit/models/test_profile.py
index 21e1c8215..1b77d15c8 100644
--- a/tests/unit/models/test_profile.py
+++ b/tests/unit/models/test_profile.py
@@ -5,25 +5,24 @@
 from sqlalchemy.exc import StatementError
 
 
-def test_profile_urltype_valid(test_client, test_db, new_profile):
-    new_profile.logo_url = "https://hasgeek.com"
-    test_db.session.add(new_profile)
-    test_db.session.commit()
-    assert isinstance(new_profile.logo_url, furl)
-    assert new_profile.logo_url.url == "https://hasgeek.com"
-
-
-def test_profile_urltype_invalid(test_client, test_db, new_profile):
-    new_profile.logo_url = "noturl"
-    test_db.session.add(new_profile)
-    with pytest.raises(StatementError):
+class TestProfile(object):
+    def test_profile_urltype_valid(self, test_client, test_db, new_profile):
+        new_profile.logo_url = "https://hasgeek.com"
+        test_db.session.add(new_profile)
         test_db.session.commit()
-    test_db.session.rollback()
+        assert isinstance(new_profile.logo_url, furl)
+        assert new_profile.logo_url.url == "https://hasgeek.com"
 
+    def test_profile_urltype_invalid(self, test_client, test_db, new_profile):
+        new_profile.logo_url = "noturl"
+        test_db.session.add(new_profile)
+        with pytest.raises(StatementError):
+            test_db.session.commit()
+        test_db.session.rollback()
 
-def test_reserved_name(test_client, test_db, new_profile):
-    new_profile.title = "Proposals"
-    new_profile.make_name()
-    # because `proposals` is in reserved name list, `make_name` will
-    # try to generate a name for it starting with suffixing it with 2.
-    assert new_profile.name == "proposals2"
+    def test_reserved_name(self, test_client, test_db, new_profile):
+        new_profile.title = "Proposals"
+        new_profile.make_name()
+        # because `proposals` is in reserved name list, `make_name` will
+        # try to generate a name for it starting with suffixing it with 2.
+        assert new_profile.name == "proposals2"
diff --git a/tests/unit/models/test_project.py b/tests/unit/models/test_project.py
index bd40f4cdb..00d2a0167 100644
--- a/tests/unit/models/test_project.py
+++ b/tests/unit/models/test_project.py
@@ -3,21 +3,22 @@
 from funnel.models import Project
 
 
-def test_project_state_conditional(test_client, test_db):
-    past_projects = Project.query.filter(Project.state.PAST).all()
-    assert len(past_projects) >= 0
-    upcoming_projects = Project.query.filter(Project.state.UPCOMING).all()
-    assert len(upcoming_projects) >= 0
+class TestProject(object):
+    def test_project_state_conditional(self, test_client, test_db):
+        past_projects = Project.query.filter(Project.state.PAST).all()
+        assert len(past_projects) >= 0
+        upcoming_projects = Project.query.filter(Project.state.UPCOMING).all()
+        assert len(upcoming_projects) >= 0
 
 
-def test_project_cfp_state_conditional(test_client, test_db):
-    private_draft_cfp_projects = Project.query.filter(Project.cfp_state.PRIVATE_DRAFT).all()
-    assert len(private_draft_cfp_projects) >= 0
-    draft_cfp_projects = Project.query.filter(Project.cfp_state.DRAFT).all()
-    assert len(draft_cfp_projects) >= 0
-    upcoming_cfp_projects = Project.query.filter(Project.cfp_state.UPCOMING).all()
-    assert len(upcoming_cfp_projects) >= 0
-    open_cfp_projects = Project.query.filter(Project.cfp_state.OPEN).all()
-    assert len(open_cfp_projects) >= 0
-    expired_cfp_projects = Project.query.filter(Project.cfp_state.EXPIRED).all()
-    assert len(expired_cfp_projects) >= 0
+    def test_project_cfp_state_conditional(self, test_client, test_db):
+        private_draft_cfp_projects = Project.query.filter(Project.cfp_state.PRIVATE_DRAFT).all()
+        assert len(private_draft_cfp_projects) >= 0
+        draft_cfp_projects = Project.query.filter(Project.cfp_state.DRAFT).all()
+        assert len(draft_cfp_projects) >= 0
+        upcoming_cfp_projects = Project.query.filter(Project.cfp_state.UPCOMING).all()
+        assert len(upcoming_cfp_projects) >= 0
+        open_cfp_projects = Project.query.filter(Project.cfp_state.OPEN).all()
+        assert len(open_cfp_projects) >= 0
+        expired_cfp_projects = Project.query.filter(Project.cfp_state.EXPIRED).all()
+        assert len(expired_cfp_projects) >= 0

From baf90495f66dc96060fbbacf9c6e72de8ef40d0b Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Wed, 24 Apr 2019 15:30:52 +0530
Subject: [PATCH 086/125] added test for label icon

---
 tests/unit/models/test_label.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index 3778f727b..3455b6f6c 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -50,5 +50,11 @@ def test_label_flags(self, new_main_label, new_label):
         assert new_main_label in restricted_labels
         assert new_label not in restricted_labels
 
-    # TODO: test label icon property
+    def test_label_icon(self, test_client, test_db, new_label):
+        assert new_label.icon == new_label.icon_emoji
+        new_label.icon_emoji = ""
+        test_db.session.commit()
+        assert new_label.title == "Label B"
+        assert new_label.icon == "LB"
+
     # TODO: test that label options complain if you set restricted flag

From ca55200efe557e3c311cfca4c5ad95742cba6bee Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Wed, 24 Apr 2019 21:59:20 +0530
Subject: [PATCH 087/125] added test for restricted setter

---
 tests/unit/models/test_label.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index 3455b6f6c..714dbf6b2 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -22,6 +22,11 @@ def test_child_label_from_fixture(self, test_client, test_db, new_main_label):
         assert label_a1.icon == u"👍"
         assert not label_a1.has_options
 
+        with pytest.raises(ValueError):
+            # because Label A1 is not a main and optioned label,
+            # it's restricted flag cannot be set
+            label_a1.restricted = True
+
     def test_label_from_fixture(self, test_client, test_db, new_label):
         assert new_label.title == u"Label B"
         assert new_label.icon_emoji == u"🔟"
@@ -51,10 +56,9 @@ def test_label_flags(self, new_main_label, new_label):
         assert new_label not in restricted_labels
 
     def test_label_icon(self, test_client, test_db, new_label):
+        # if the label has icon_emoji, that's get set as icon
         assert new_label.icon == new_label.icon_emoji
         new_label.icon_emoji = ""
         test_db.session.commit()
         assert new_label.title == "Label B"
         assert new_label.icon == "LB"
-
-    # TODO: test that label options complain if you set restricted flag

From e7b86b2edd14da94dec8b50d15ce67384303dca3 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Thu, 25 Apr 2019 00:59:38 +0530
Subject: [PATCH 088/125] added simple integration test

---
 funnel/forms/label.py                         |  1 +
 tests/conftest.py                             | 21 +++++--------------
 tests/integration/__init__.py                 |  0
 tests/integration/views/__init__.py           |  0
 tests/integration/views/test_project_views.py | 15 +++++++++++++
 5 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 tests/integration/__init__.py
 create mode 100644 tests/integration/views/__init__.py
 create mode 100644 tests/integration/views/test_project_views.py

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 485da0b22..499371829 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -18,6 +18,7 @@ class LabelForm(forms.Form):
 
 
 class LabelSeqForm(forms.Form):
+    id = forms.IntegerField("", widget=forms.HiddenInput())
     seq = forms.IntegerField("", widget=forms.HiddenInput())
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 1d4857a3c..570067e3b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,24 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from flask import Flask
 import pytest
 import uuid
-import coaster.app
-from flask_lastuser import Lastuser
-from flask_lastuser.sqlalchemy import UserManager
+from funnel import app
 from funnel.models import db, Profile, Project, User, Label, Proposal, Team
 
 
-flask_app = Flask(__name__, instance_relative_config=True)
-lastuser = Lastuser()
-# this sets the mock usermanager up for use
-lastuser.init_usermanager(UserManager(db, User, Team))
-coaster.app.init_app(flask_app)
-db.init_app(flask_app)
-lastuser.init_app(flask_app)
-
-
-@flask_app.route('/usertest')
+@app.route('/usertest')
 def user_test():
     from coaster.auth import current_auth
     return current_auth.user.username if current_auth.user is not None else "anon"
@@ -43,14 +31,15 @@ def user_test():
 # Scope: session
 # These fixtures are run before every test session
 
+
 @pytest.fixture(scope='session')
 def test_client():
     # Flask provides a way to test your application by exposing the Werkzeug test Client
     # and handling the context locals for you.
-    testing_client = flask_app.test_client()
+    testing_client = app.test_client()
 
     # Establish an application context before running the tests.
-    ctx = flask_app.app_context()
+    ctx = app.app_context()
     ctx.push()
 
     yield testing_client  # this is where the testing happens!
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/integration/views/__init__.py b/tests/integration/views/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/integration/views/test_project_views.py b/tests/integration/views/test_project_views.py
new file mode 100644
index 000000000..8a29f7864
--- /dev/null
+++ b/tests/integration/views/test_project_views.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from funnel.models import Label
+from funnel.forms import LabelForm, LabelOptionForm
+
+
+class TestProjectViews(object):
+    def test_labels_view(self, test_client, new_user, new_project):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp = c.get(new_project.url_for('new_label'))
+            label_form = LabelForm(parent=new_project, model=Label)
+            for field in label_form:
+                assert field.name in resp.data

From 4441f64da6c869bfada95c3cb6439797801051d3 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Thu, 25 Apr 2019 10:01:15 +0530
Subject: [PATCH 089/125] added test for label create view

---
 instance/testing.py                           | 5 +++++
 tests/integration/views/test_project_views.py | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/instance/testing.py b/instance/testing.py
index 624ab0482..d2f09c1ee 100644
--- a/instance/testing.py
+++ b/instance/testing.py
@@ -11,3 +11,8 @@
 RQ_LOW_URL = 'redis://localhost:6379/0'
 ASSET_BASE_PATH = "build"
 HASCORE_SERVER = 'https://api.hasgeek.com'
+WTF_CSRF_ENABLED = False
+WTF_CSRF_METHODS = {}
+
+ASSET_MANIFEST_PATH = "static/build/manifest.json"
+ASSET_BASE_PATH = "build"
diff --git a/tests/integration/views/test_project_views.py b/tests/integration/views/test_project_views.py
index 8a29f7864..416cd39df 100644
--- a/tests/integration/views/test_project_views.py
+++ b/tests/integration/views/test_project_views.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from werkzeug.datastructures import MultiDict
 from funnel.models import Label
 from funnel.forms import LabelForm, LabelOptionForm
 
@@ -13,3 +14,11 @@ def test_labels_view(self, test_client, new_user, new_project):
             label_form = LabelForm(parent=new_project, model=Label)
             for field in label_form:
                 assert field.name in resp.data
+
+            resp_post = c.post(new_project.url_for('new_label'), data=MultiDict({
+                'title': u"Label V1", 'icon_emoji': u"👍",
+                'required': False, 'restricted': False
+            }), follow_redirects=True)
+            assert u"Manage labels" in resp_post.data.decode('utf-8')
+            label_v2 = Label.query.filter_by(title=u"Label V1", icon_emoji=u"👍", project=new_project).first()
+            assert label_v2 is not None

From 87fd255dc55234a2f9590c70d9827424f77eb0ad Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Thu, 25 Apr 2019 12:07:28 +0530
Subject: [PATCH 090/125] added test for adding labels with options

---
 funnel/views/label.py                         | 10 +++----
 tests/integration/views/test_project_views.py | 30 +++++++++++++++++--
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index b48d74ce4..eabca7c45 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -52,9 +52,8 @@ def new_label(self):
 
             for idx, title in enumerate(titlelist):
                 subform = LabelOptionForm(MultiDict({
-                    'csrf_token': form.csrf_token.data, 'title': titlelist[idx],
-                    'icon_emoji': emojilist[idx]
-                    }))
+                    'title': titlelist[idx], 'icon_emoji': emojilist[idx]
+                    }), meta={'csrf': False})  # parent form has valid CSRF token
 
                 if not subform.validate():
                     flash(_("Error with a sublabel: {}").format(subform.errors.pop()), category='error')
@@ -129,9 +128,8 @@ def edit(self):
                     subl.icon_emoji = emojilist[idx]
                 else:
                     subform = LabelOptionForm(MultiDict({
-                        'csrf_token': form.csrf_token.data, 'title': titlelist[idx],
-                        'icon_emoji': emojilist[idx]
-                        }))
+                        'title': titlelist[idx], 'icon_emoji': emojilist[idx]
+                        }), meta={'csrf': False})  # parent form has valid CSRF token
 
                     if not subform.validate():
                         flash(_("Error with a sublabel: {}").format(subform.errors.pop()), category='error')
diff --git a/tests/integration/views/test_project_views.py b/tests/integration/views/test_project_views.py
index 416cd39df..d1e3aa875 100644
--- a/tests/integration/views/test_project_views.py
+++ b/tests/integration/views/test_project_views.py
@@ -6,7 +6,7 @@
 
 
 class TestProjectViews(object):
-    def test_labels_view(self, test_client, new_user, new_project):
+    def test_new_label_get(self, test_client, new_user, new_project):
         with test_client.session_transaction() as session:
             session['lastuser_userid'] = new_user.userid
         with test_client as c:
@@ -15,10 +15,36 @@ def test_labels_view(self, test_client, new_user, new_project):
             for field in label_form:
                 assert field.name in resp.data
 
+    def test_new_label_without_option(self, test_client, new_user, new_project):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
             resp_post = c.post(new_project.url_for('new_label'), data=MultiDict({
                 'title': u"Label V1", 'icon_emoji': u"👍",
                 'required': False, 'restricted': False
             }), follow_redirects=True)
             assert u"Manage labels" in resp_post.data.decode('utf-8')
-            label_v2 = Label.query.filter_by(title=u"Label V1", icon_emoji=u"👍", project=new_project).first()
+            label_v1 = Label.query.filter_by(title=u"Label V1", icon_emoji=u"👍", project=new_project).first()
+            assert label_v1 is not None
+
+    def test_new_label_with_option(self, test_client, new_user, new_project):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp_post = c.post(new_project.url_for('new_label'), data=MultiDict({
+                'title': [u"Label V2", "Option V21", "Option V22"], 'icon_emoji': [u"👍", "", ""],
+                'required': False, 'restricted': False
+            }), follow_redirects=True)
+            assert u"Manage labels" in resp_post.data.decode('utf-8')
+            label_v2 = Label.query.filter_by(title=u"Label V2", icon_emoji=u"👍", project=new_project).first()
             assert label_v2 is not None
+            assert label_v2.has_options
+            assert len(label_v2.options) == 2
+
+            assert label_v2.options[0].title == "Option V21"
+            assert label_v2.options[0].icon_emoji == ""
+            assert label_v2.options[0].icon == "OV"
+
+            assert label_v2.options[1].title == "Option V22"
+            assert label_v2.options[1].icon_emoji == ""
+            assert label_v2.options[1].icon == "OV"

From 93718f85f968a535808e5f87ff2a289ed8edf6af Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Thu, 25 Apr 2019 15:46:46 +0530
Subject: [PATCH 091/125] added id field to labels form

---
 funnel/templates/labels.html.jinja2 | 3 ++-
 funnel/views/label.py               | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index d7f2f4fb5..817171b1b 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -16,7 +16,8 @@
         <div class="ui-dragable-box ui-dragable-box--small" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
           {% if label.has_options %}
             <i class="material-icons mui--text-body1 drag-icon">drag_handle</i>
-            <input name="label-seq" value="{{ label.seq }}" type="hidden" class="seq-input">
+            <input name="id" value="{{ label.id }}" type="hidden" class="id-input">
+            <input name="seq" value="{{ label.seq }}" type="hidden" class="seq-input">
             <h3 class="mui--text-subhead ui-dragable-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
             <ul class="mui-list--aligned mui-list--unstyled ui-dragable-box__list">
               {%- for sublabel in label.options %}
diff --git a/funnel/views/label.py b/funnel/views/label.py
index eabca7c45..f7da9aaab 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -16,13 +16,14 @@
 class ProjectLabelView(ProjectViewMixin, UrlForView, ModelView):
     __decorators__ = [legacy_redirect]
 
-    @route('')
+    @route('', methods=['GET', 'POST'])
     @render_with('labels.html.jinja2')
     @lastuser.requires_login
     @requires_permission('edit_project')
     def labels(self):
         # TODO: Update form to save sequence of main labels
         form = LabelSeqForm(model=Label, parent=self.obj.parent)
+        print request.values
         return dict(project=self.obj, labels=self.obj.labels, form=form)
 
     @route('new', methods=['GET', 'POST'])

From b408afc9cb18fcb226bd52f7a0e129c1d6dea7ab Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Thu, 25 Apr 2019 15:52:02 +0530
Subject: [PATCH 092/125] Style changes and moved widget JS code to JS bundle

---
 funnel/assets/js/proposal.js             | 67 +++++++++++++++++++----
 funnel/assets/package-lock.json          |  5 --
 funnel/assets/package.json               |  1 -
 funnel/static/css/app.css                | 59 +++++++++++---------
 funnel/static/sass/_form.scss            | 69 +++++++++++++-----------
 funnel/static/sass/_proposal.scss        |  1 +
 funnel/templates/labels.html.jinja2      |  5 +-
 funnel/templates/labels_form.html.jinja2 |  8 +--
 funnel/templates/proposal.html.jinja2    | 53 +-----------------
 9 files changed, 139 insertions(+), 129 deletions(-)

diff --git a/funnel/assets/js/proposal.js b/funnel/assets/js/proposal.js
index 2a4120e10..2f475e776 100644
--- a/funnel/assets/js/proposal.js
+++ b/funnel/assets/js/proposal.js
@@ -1,5 +1,3 @@
-import hexRgb from 'hex-rgb';
-
 export const Comments = {
   init(pageURL) {
     $('.comment .js-collapse').click(function() {
@@ -103,22 +101,71 @@ export const Video = {
   },
 };
 
-export const Labels = {
+export const LabelsWidget = {
   init() {
-    $.each($('.js-labels'), function(index, label){
-      let bgcolor = $(label).data('bgcolor');
-      let rgbBgcolor = hexRgb(bgcolor, {format: 'array'});
-      let cssBgcolor = `rgba(${rgbBgcolor[0]}, ${rgbBgcolor[1]}, ${rgbBgcolor[2]}, 0.6)`;
-      $(label).css('background-color', cssBgcolor);
-      $(label).css('border-color', bgcolor);
+    const Widget = this;
+    // On load, if the radio has been selected, then check mark the listwidget label
+    $('.listwidget input[type="radio"]').each(function() {
+      if(this.checked) {
+        $(this).parents().find('.mui-form__label').addClass('checked');
+      }
+    });
+
+    $('.listwidget .mui-form__label').click(function() {
+      if($(this).hasClass('checked')) {
+        $(this).removeClass('checked');
+        $(this).parents().find('input[type="radio"]').prop('checked', false);
+        Widget.updateLabels('', $(this).text().trim(), false);
+      } else {
+        $(this).addClass('checked');
+        $(this).parents().find('input[type="radio"]').first().click();
+      }
+    });
+
+        // Add check mark to listwidget label
+    $('.listwidget input[type="radio"]').change(function() {
+      $(this).parents().find('.mui-form__label').addClass('checked');
+      let labelTxt = `${$(this).parents().find('.mui-form__label').text()}: ${$(this).parent().find('label').text()}`.trim();
+      let attr = $(this).parents().find('.mui-form__label').text().trim();
+      Widget.updateLabels(labelTxt, attr, this.checked);
+    });
+
+    $('.add-label-form input[type="checkbox"]').change(function() {
+      let labelTxt = $(this).parent('label').text().trim();
+      Widget.updateLabels(labelTxt, labelTxt, this.checked);
     });
+
+    // Open and close dropdown
+    $(document).on('click', function(event) {
+      if ($('#label-select')[0] === event.target || !$(event.target).parents('#label-dropdown').length) {
+        Widget.handleDropdown();
+      }
+    });
+  },
+  handleDropdown() {
+    if($('#label-dropdown fieldset').hasClass('active')) {
+      $('#label-dropdown fieldset').removeClass('active');
+    } else {
+      $('#label-dropdown fieldset').addClass('active');
+    }
   },
+  updateLabels(label='', attr='', action=true) {
+    if(action) {
+      if(label !== attr) {
+        $(`.label[data-labeltxt="${attr}"]`).remove();
+      }
+      let span = `<span class="label mui--text-caption mui--text-bold" data-labeltxt="${attr}">${label}</span>`;
+      $('#label-select').append(span);
+    } else {
+      $(`.label[data-labeltxt="${attr}"]`).remove();
+    }
+  }
 };
 
 $(() => {
   window. HasGeek.ProposalInit = function ({pageUrl, videoWrapper= '', videoUrl= ''}) {
     Comments.init(pageUrl);
-    Labels.init();
+    LabelsWidget.init();
 
     if (videoWrapper) {
       Video.embedIframe(videoWrapper, videoUrl);
diff --git a/funnel/assets/package-lock.json b/funnel/assets/package-lock.json
index eb015915f..809af79c9 100644
--- a/funnel/assets/package-lock.json
+++ b/funnel/assets/package-lock.json
@@ -3375,11 +3375,6 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
-    "hex-rgb": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.0.0.tgz",
-      "integrity": "sha512-7z7WxdbS99/vesuH/I4FkJJ+tX/CTipjbQeQ/qqLe2I2XT64f7FsDd3EtJiz4NFczaCjOvYIMJL0fJLHnJQKcg=="
-    },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
diff --git a/funnel/assets/package.json b/funnel/assets/package.json
index 102740080..6cef6b8e4 100644
--- a/funnel/assets/package.json
+++ b/funnel/assets/package.json
@@ -25,7 +25,6 @@
   },
   "dependencies": {
     "hammerjs": "^2.0.8",
-    "hex-rgb": "^4.0.0",
     "jsqr": "^1.1.1",
     "leaflet": "^1.4.0",
     "ractive": "^0.7.3",
diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index f956a2a10..659c598a3 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -412,7 +412,7 @@ html.touch .collapsible__body--disable {
 }
 
 .label-title {
-  width: calc(100% - 90px);
+  width: calc(100% - 130px);
   display: inline-block;
 }
 
@@ -471,6 +471,11 @@ html.touch .collapsible__body--disable {
   position: relative;
   margin: 10px 15px;
 }
+.ui-dragable-box .drag-icon {
+  position: absolute;
+  left: 5px;
+  top: 0;
+}
 
 .ui-dragable-box__header {
   padding: 0;
@@ -478,36 +483,42 @@ html.touch .collapsible__body--disable {
 }
 
 .ui-dragable-box--small {
-  margin: 10px 0;
+  margin: 10px;
   max-width: 400px;
-  padding: 0 15px;
+  padding: 10px 5px;
 }
-
-.ui-dragable-box--header .collapsible__header {
-  margin: 0;
-}
-
-.ui-dragable-box label {
-  cursor: pointer;
+.ui-dragable-box--small .drag-icon {
+  position: relative;
+  float: left;
+  margin-right: 10px;
+  vertical-align: middle;
+  margin-top: 15px;
+  color: #888;
 }
-
-.ui-dragable-box .drag-icon {
+.ui-dragable-box--small .remove-btn {
   position: absolute;
-  left: 5px;
   top: 0;
-}
-
-.ui-dragable-box--small .drag-icon {
-  position: absolute;
-  left: 10px;
-  top: 15px;
+  z-index: 100;
+  right: 5px;
+  background: #fff;
 }
 .ui-dragable-box--small .ui-dragable-box__heading {
   margin-left: 15px;
   margin-top: 15px;
 }
 .ui-dragable-box--small .ui-dragable-box__list {
-  padding-left: 2em;
+  padding-left: 3em;
+}
+.ui-dragable-box--small .action-btn-wrapper {
+  margin-left: 15px;
+}
+
+.ui-dragable-box--header .collapsible__header {
+  margin: 0;
+}
+
+.ui-dragable-box label {
+  cursor: pointer;
 }
 
 .ui-dragable-box:hover {
@@ -558,11 +569,8 @@ html.touch .collapsible__body--disable {
   max-width: 500px;
 }
 
-.remove-btn {
-  position: absolute;
-  top: 0;
-  z-index: 100;
-  right: 5px;
+.sub-form {
+  margin-left: 20px;
 }
 
 .clickable-card {
@@ -1195,6 +1203,7 @@ html.touch .collapsible__body--disable {
   border-bottom: 1px solid #ccc;
   width: 100%;
   position: relative;
+  cursor: pointer;
 }
 .selected-label .material-icons {
   position: absolute;
diff --git a/funnel/static/sass/_form.scss b/funnel/static/sass/_form.scss
index 620ca58ae..347eedbc1 100644
--- a/funnel/static/sass/_form.scss
+++ b/funnel/static/sass/_form.scss
@@ -22,7 +22,7 @@
 }
 
 .label-title {
-  width: calc(100% - 90px);
+  width: calc(100% - 130px);
   display: inline-block;
 }
 
@@ -86,6 +86,12 @@
   cursor: pointer;
   position: relative;
   margin: 10px 15px;
+
+  .drag-icon {
+    position: absolute;
+    left: 5px;
+    top: 0;
+  }
 }
 
 .ui-dragable-box__header {
@@ -94,43 +100,49 @@
 }
 
 .ui-dragable-box--small {
-  margin: 10px 0;
+  margin: 10px;
   max-width: 400px;
-  padding: 0 15px;
-}
-
-.ui-dragable-box--header .collapsible__header {
-  margin: 0;
-}
-
-.ui-dragable-box label {
-  cursor: pointer;
-}
-
-.ui-dragable-box .drag-icon {
-  position: absolute;
-  left: 5px;
-  top: 0;
-}
-
-.ui-dragable-box--small {
+  padding: 10px 5px;
 
   .drag-icon {
+    position: relative;
+    float: left;
+    margin-right: 10px;
+    vertical-align: middle;
+    margin-top: 15px;
+    color: #888;
+  }
+
+  .remove-btn {
     position: absolute;
-    left: 10px;
-    top: 15px;
+    top: 0;
+    z-index: 100;
+    right: 5px;
+    background: #fff;
   }
-  
+
   .ui-dragable-box__heading {
     margin-left: 15px;
     margin-top: 15px;
   }
 
   .ui-dragable-box__list {
-    padding-left: 2em;
+    padding-left: 3em;
+  }
+
+  .action-btn-wrapper {
+    margin-left: 15px;
   }
 }
 
+.ui-dragable-box--header .collapsible__header {
+  margin: 0;
+}
+
+.ui-dragable-box label {
+  cursor: pointer;
+}
+
 .ui-dragable-box:hover {
   cursor: pointer;
   box-shadow: 0 1px 3px rgba(158,158,158,0.12), 0 1px 2px rgba(158,158,158,0.24);
@@ -180,9 +192,6 @@
   max-width: 500px;
 }
 
-.remove-btn {
-  position: absolute;
-  top: 0;
-  z-index: 100;
-  right: 5px;
-}
\ No newline at end of file
+.sub-form {
+  margin-left: 20px;
+}
diff --git a/funnel/static/sass/_proposal.scss b/funnel/static/sass/_proposal.scss
index 14b1016b1..7dffe7163 100644
--- a/funnel/static/sass/_proposal.scss
+++ b/funnel/static/sass/_proposal.scss
@@ -326,6 +326,7 @@
   border-bottom: 1px solid #ccc;
   width: 100%;
   position: relative;
+  cursor: pointer;
 
   .material-icons {
     position: absolute;
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index d7f2f4fb5..f19b82442 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -15,7 +15,8 @@
       {%- for label in labels %}
         <div class="ui-dragable-box ui-dragable-box--small" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
           {% if label.has_options %}
-            <i class="material-icons mui--text-body1 drag-icon">drag_handle</i>
+            <i class="material-icons mui--text-body1 drag-icon">drag_indicator</i>
+            <input name="label-id" value="{{ label.id }}" type="hidden">
             <input name="label-seq" value="{{ label.seq }}" type="hidden" class="seq-input">
             <h3 class="mui--text-subhead ui-dragable-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
             <ul class="mui-list--aligned mui-list--unstyled ui-dragable-box__list">
@@ -30,7 +31,7 @@
           {% else %}
             <h3 class="mui--text-subhead ui-dragable-box__heading">{{ label.title }}</h3>
           {% endif %}
-          <div>
+          <div class="action-btn-wrapper">
             <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit label{% endtrans %}</a>
             <!-- <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-href="" title="{% trans %}Add label{% endtrans %}" id="add-label-btn">{% trans %}Archive{% endtrans %}</a> -->
           </div>
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index 724c9275e..bbe1a7e8e 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -10,8 +10,10 @@
 
 {% macro labelformfields(lform, subform=false, empty=false) %}
   {%- if subform %}
-    <div class="ui-dragable-box" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true">
+    <div class="ui-dragable-box ui-dragable-box--small" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true">
       {{ lform.hidden_tag() }}
+      <i class="material-icons mui--text-body1 drag-icon">drag_indicator</i>
+      {{ renderfield(lform.seq, css_class="seq-input") }}
   {%- endif %}
   {{ renderfield(lform.icon_emoji, css_class="emojipicker") }}
   {%- for error in lform.icon_emoji.errors %}
@@ -28,8 +30,6 @@
     {%- if empty %}<button class="mui-btn--nostyle js-remove-sublabel-form remove-btn"><i class="material-icons mui--text-body1">close</i></button>{%- endif %}
     <!-- Add archive button for existing sublabels -->
   {%- if subform %}
-    <i class="material-icons mui--text-body1 drag-icon">drag_handle</i>
-    {{ renderfield(lform.seq, css_class="seq-input") }}
     </div>
   {%- endif %}
 {% endmacro %}
@@ -47,7 +47,7 @@
   <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins mui-form--smaller ">
     {{ form.hidden_tag() }}
     {{ labelformfields(form) }}
-    <div id="child-form">
+    <div id="child-form" class="sub-form">
       {% if form.edit_obj and form.edit_obj.has_options and subforms %}
         {% for subform in subforms %}
           {{ labelformfields(subform, subform=true) }}
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 562643399..e57579b64 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -209,7 +209,7 @@
                   <p class="mui--text-title">Labels</p>
                   <div class="selected-label" id="label-select">
                     {%- for label in proposal.labels %}
-                      <span class="label mui--text-caption mui--text-bold" data-labeltxt="{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}">{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
+                      <span class="label mui--text-caption mui--text-bold" data-labeltxt="{% if label.main_label %}{% if label.main_label.icon_emoji -%}{{ label.main_label.icon_emoji }} {{ label.main_label.title }}{% else -%}{{ label.main_label.title }}{% endif %}{% elif label.icon_emoji -%}{{ label.icon_emoji }} {{ label.title }}{% else -%}{{ label.title }}{% endif %}">{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
                     {%- endfor %}
                     <i class="material-icons">arrow_drop_down</i>
                   </div>
@@ -321,57 +321,6 @@
     }
     HasGeek.ProposalInit(proposalConfig);
 
-
-    // TODO: to be moved to proposal.js
-    function handleDropdown() {
-      if($('#label-dropdown fieldset').hasClass('active')) {
-        $('#label-dropdown fieldset').removeClass('active');
-      } else {
-        $('#label-dropdown fieldset').addClass('active');
-      }
-    }
-
-    function updateLabels(label, attr, action) {
-      if(action) {
-        if(label !== attr) {
-          $('.label[data-labeltxt="' + attr +  '"]').remove();
-        }
-        var span = '<span class="label mui--text-caption mui--text-bold" data-labeltxt="' + attr + '"">' + label +'</span>';
-        $('#label-select').append(span);
-      } else {
-        $('.label[data-labeltxt="' + attr +  '"]').remove();
-      }
-    }
-
-    // On load, if the radio has been selected, then check mark the listwidget label
-    $('.listwidget input[type="radio"]').each(function() {
-      if(this.checked) {
-        $(this).parents().find('.mui-form__label').addClass('checked');
-      }
-    });
-
-        // Add check mark to listwidget label
-    $('.listwidget input[type="radio"]').change(function() {
-      $(this).parents().find('.mui-form__label').addClass('checked');
-      console.log('radio', this, this.checked);
-      var labelTxt = $(this).parents().find('.mui-form__label').text() + ': ' + $(this).parent().find('label').text();
-      labelTxt = labelTxt.trim();
-      var attr = $(this).parents().find('.mui-form__label').text().trim();
-      updateLabels(labelTxt, attr, this.checked);
-    });
-
-    $('.add-label-form input[type="checkbox"]').change(function() {
-      var labelTxt = $(this).parent('label').text().trim();
-      updateLabels(labelTxt, labelTxt, this.checked);
-    });
-
-    // Open and close dropdown
-    $(document).on('click', function(event) {
-      if ($('#label-select')[0] == event.target || !$(event.target).parents('#label-dropdown').length) {
-        handleDropdown();
-      }
-    });
-
   });
 </script>
 <script type="text/javascript" src="//apis.google.com/js/plusone.js"></script>

From 0a6cbe1e6f07d1db46132003a3f23c48fb440ef9 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Thu, 25 Apr 2019 16:32:20 +0530
Subject: [PATCH 093/125] running npm build in travis

---
 .travis.yml                     | 1 +
 tests/unit/models/test_label.py | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ef0c8be76..2688424aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ install:
   - pip install -U pip wheel
   - pip install -r requirements.txt
   - pip install -r test_requirements.txt
+  - make
 script:
   - ./runtests.sh
 after_success:
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index 714dbf6b2..1f62af68b 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -7,7 +7,6 @@
 class TestLabels(object):
     def test_main_label_from_fixture(self, test_client, new_main_label):
         assert new_main_label.title == u"Parent Label A"
-        assert new_main_label.seq == 1
         assert new_main_label.has_options
         assert new_main_label.required
         assert new_main_label.restricted

From 14651dec9acddb74ae98c271810d9bd187761a05 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Thu, 25 Apr 2019 17:13:51 +0530
Subject: [PATCH 094/125] Add seq and id field for all labels

---
 funnel/templates/labels.html.jinja2 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 1efb3cd2c..1e4aa525c 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -11,13 +11,12 @@
 <div class="grid">
   <div class="grid__col-xs-12 grid__col-md-6">
     <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form">
-      {{ form.hidden_tag() }}
       {%- for label in labels %}
         <div class="ui-dragable-box ui-dragable-box--small" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
+          <i class="material-icons mui--text-body1 drag-icon">drag_indicator</i>
+          <input name="id" value="{{ label.id }}" type="hidden" class="id-input">
+          <input name="seq" value="{{ label.seq }}" type="hidden" class="seq-input">
           {% if label.has_options %}
-            <i class="material-icons mui--text-body1 drag-icon">drag_indicator</i>
-            <input name="id" value="{{ label.id }}" type="hidden" class="id-input">
-            <input name="seq" value="{{ label.seq }}" type="hidden" class="seq-input">
             <h3 class="mui--text-subhead ui-dragable-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
             <ul class="mui-list--aligned mui-list--unstyled ui-dragable-box__list">
               {%- for sublabel in label.options %}

From ebb55d77b7ee04ebf14a78687eb8bf6e69490f1d Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Thu, 25 Apr 2019 18:19:42 +0530
Subject: [PATCH 095/125] Update the UI of manage label page

---
 funnel/static/css/app.css                | 104 ++++++++---------
 funnel/static/sass/_form.scss            | 141 +++++++++--------------
 funnel/static/sass/_label.scss           |  25 ++++
 funnel/static/sass/_proposal.scss        |   1 -
 funnel/static/sass/app.scss              |   1 +
 funnel/templates/labels.html.jinja2      |  46 +++-----
 funnel/templates/labels_form.html.jinja2 |  12 +-
 funnel/templates/proposal.html.jinja2    |   2 +-
 8 files changed, 150 insertions(+), 182 deletions(-)
 create mode 100644 funnel/static/sass/_label.scss

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 659c598a3..da3efa70f 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -411,26 +411,36 @@ html.touch .collapsible__body--disable {
   vertical-align: middle;
 }
 
-.label-title {
+.label-form {
+  max-width: 500px;
+}
+.label-form .label-form__title-field {
   width: calc(100% - 130px);
   display: inline-block;
 }
-
-.label-title--close {
+.label-form .label-form__title-field--close {
   width: calc(100% - 114px);
-  display: inline-block;
 }
-
-.mui-form__fields.emojipicker {
+.label-form .label-form__subform__close-btn {
+  position: absolute;
+  top: 0;
+  z-index: 100;
+  right: 5px;
+  background: #fff;
+}
+.label-form .label-form__subform {
+  margin-left: 20px;
+}
+.label-form .emojipicker {
   float: left;
   width: 70px;
   height: 48px;
   margin-right: 20px;
 }
-.mui-form__fields.emojipicker label {
+.label-form .emojipicker label {
   display: none;
 }
-.mui-form__fields.emojipicker .emojionearea-editor {
+.label-form .emojipicker .emojionearea-editor {
   height: 48px;
   min-height: 20px;
   overflow: hidden;
@@ -441,27 +451,21 @@ html.touch .collapsible__body--disable {
   right: 24px;
   padding: 6px 0;
 }
-.mui-form__fields.emojipicker .emojionearea-button {
+.label-form .emojipicker .emojionearea-button {
   top: 10px;
 }
-.mui-form__fields.emojipicker .emojionearea-editor {
+.label-form .emojipicker .emojionearea-editor {
   left: 6px !important;
   padding-right: 45px !important;
 }
-.mui-form__fields.emojipicker .emojionearea-button .emojionearea-button-open,
-.mui-form__fields.emojipicker .emojionearea-button .emojionearea-button-close {
+.label-form .emojipicker .emojionearea-button .emojionearea-button-open,
+.label-form .emojipicker .emojionearea-button .emojionearea-button-close {
   right: 3px;
 }
-.mui-form__fields.emojipicker .emojionearea .emojionearea-editor [class*=emojione-], .mui-form__fields.emojipicker .emojionearea .emojionearea-editor .emojioneemoji {
+.label-form .emojipicker .emojionearea .emojionearea-editor [class*=emojione-], .label-form .emojipicker .emojionearea .emojionearea-editor .emojioneemoji {
   margin: -.2ex 1ex .2ex -0.5ex;
 }
 
-.sub-form-field {
-  box-shadow: 0 0 2px rgba(0, 0, 0, 0.12), 0 2px 2px rgba(0, 0, 0, 0.2);
-  margin: 10px 0 10px 20px;
-  padding: 10px;
-}
-
 .ui-dragable-box {
   padding: 25px 10px 10px 20px;
   border-radius: 3px;
@@ -482,37 +486,6 @@ html.touch .collapsible__body--disable {
   margin: 10px 0;
 }
 
-.ui-dragable-box--small {
-  margin: 10px;
-  max-width: 400px;
-  padding: 10px 5px;
-}
-.ui-dragable-box--small .drag-icon {
-  position: relative;
-  float: left;
-  margin-right: 10px;
-  vertical-align: middle;
-  margin-top: 15px;
-  color: #888;
-}
-.ui-dragable-box--small .remove-btn {
-  position: absolute;
-  top: 0;
-  z-index: 100;
-  right: 5px;
-  background: #fff;
-}
-.ui-dragable-box--small .ui-dragable-box__heading {
-  margin-left: 15px;
-  margin-top: 15px;
-}
-.ui-dragable-box--small .ui-dragable-box__list {
-  padding-left: 3em;
-}
-.ui-dragable-box--small .action-btn-wrapper {
-  margin-left: 15px;
-}
-
 .ui-dragable-box--header .collapsible__header {
   margin: 0;
 }
@@ -565,14 +538,6 @@ html.touch .collapsible__body--disable {
   margin-left: 5px;
 }
 
-.mui-form--smaller {
-  max-width: 500px;
-}
-
-.sub-form {
-  margin-left: 20px;
-}
-
 .clickable-card {
   color: #1F2D3D;
   display: block;
@@ -1209,7 +1174,6 @@ html.touch .collapsible__body--disable {
   position: absolute;
   bottom: 10px;
   right: 0;
-  color: #888;
 }
 
 .add-label-form .label-dropdown-wrapper {
@@ -1586,6 +1550,28 @@ body > .proposal-box.ui-draggable {
   margin-top: 10px;
 }
 
+.label-box {
+  margin: 10px 0;
+  padding: 10px;
+}
+.label-box .label-box__icon {
+  float: left;
+  margin-top: 15px;
+}
+.label-box .label-box__icon + .label-box__icon {
+  margin-right: 10px;
+}
+.label-box .label-box__icon--right {
+  float: right;
+}
+.label-box .label-box__heading {
+  margin: 15px 10px;
+  display: inline-block;
+}
+.label-box .label-box__subheading {
+  margin-right: 10px;
+}
+
 .footer {
   padding-bottom: 50px;
 }
diff --git a/funnel/static/sass/_form.scss b/funnel/static/sass/_form.scss
index 347eedbc1..86190db5c 100644
--- a/funnel/static/sass/_form.scss
+++ b/funnel/static/sass/_form.scss
@@ -21,63 +21,72 @@
   vertical-align: middle;
 }
 
-.label-title {
-  width: calc(100% - 130px);
-  display: inline-block;
-}
-
-.label-title--close {
-  width: calc(100% - 114px);
-  display: inline-block;
-}
+.label-form {
+  max-width: 500px;
 
-.mui-form__fields.emojipicker {
-  float: left;
-  width: 70px;
-  height: 48px;
-  margin-right: 20px;
+  .label-form__title-field {
+    width: calc(100% - 130px);
+    display: inline-block;
+  }
 
-  label {
-    display: none;
+  .label-form__title-field--close {
+    width: calc(100% - 114px);
   }
 
-  .emojionearea-editor {
-    height: 48px;
-    min-height: 20px;
-    overflow: hidden;
-    white-space: nowrap;
+  .label-form__subform__close-btn {
     position: absolute;
     top: 0;
-    left: 12px;
-    right: 24px;
-    padding: 6px 0;
-  }
-
-  .emojionearea-button {
-    top: 10px;
-  }
-
-  .emojionearea-editor {
-    left: 6px !important;
-    padding-right: 45px !important;
+    z-index: 100;
+    right: 5px;
+    background: #fff;
   }
 
-  .emojionearea-button .emojionearea-button-open,
-  .emojionearea-button .emojionearea-button-close {
-    right: 3px;
+  .label-form__subform {
+    margin-left: 20px;
   }
 
-  .emojionearea .emojionearea-editor [class*=emojione-], .emojionearea .emojionearea-editor .emojioneemoji {
-    margin: -.2ex 1ex .2ex -0.5ex;
+  .emojipicker {
+    float: left;
+    width: 70px;
+    height: 48px;
+    margin-right: 20px;
+
+    label {
+      display: none;
+    }
+
+    .emojionearea-editor {
+      height: 48px;
+      min-height: 20px;
+      overflow: hidden;
+      white-space: nowrap;
+      position: absolute;
+      top: 0;
+      left: 12px;
+      right: 24px;
+      padding: 6px 0;
+    }
+
+    .emojionearea-button {
+      top: 10px;
+    }
+
+    .emojionearea-editor {
+      left: 6px !important;
+      padding-right: 45px !important;
+    }
+
+    .emojionearea-button .emojionearea-button-open,
+    .emojionearea-button .emojionearea-button-close {
+      right: 3px;
+    }
+
+    .emojionearea .emojionearea-editor [class*=emojione-], .emojionearea .emojionearea-editor .emojioneemoji {
+      margin: -.2ex 1ex .2ex -0.5ex;
+    }
   }
 }
 
-.sub-form-field {
-  box-shadow: 0 0 2px rgba(0,0,0,0.12), 0 2px 2px rgba(0,0,0,0.2);
-  margin: 10px 0 10px 20px;
-  padding: 10px;
-}
-
 .ui-dragable-box {
   padding: 25px 10px 10px 20px;
   border-radius: 3px;
@@ -99,42 +108,6 @@
   margin: 10px 0;
 }
 
-.ui-dragable-box--small {
-  margin: 10px;
-  max-width: 400px;
-  padding: 10px 5px;
-
-  .drag-icon {
-    position: relative;
-    float: left;
-    margin-right: 10px;
-    vertical-align: middle;
-    margin-top: 15px;
-    color: #888;
-  }
-
-  .remove-btn {
-    position: absolute;
-    top: 0;
-    z-index: 100;
-    right: 5px;
-    background: #fff;
-  }
-
-  .ui-dragable-box__heading {
-    margin-left: 15px;
-    margin-top: 15px;
-  }
-
-  .ui-dragable-box__list {
-    padding-left: 3em;
-  }
-
-  .action-btn-wrapper {
-    margin-left: 15px;
-  }
-}
-
 .ui-dragable-box--header .collapsible__header {
   margin: 0;
 }
@@ -187,11 +160,3 @@
   margin-top: 5px;
   margin-left: 5px;
 }
-
-.mui-form--smaller {
-  max-width: 500px;
-}
-
-.sub-form {
-  margin-left: 20px;
-}
diff --git a/funnel/static/sass/_label.scss b/funnel/static/sass/_label.scss
new file mode 100644
index 000000000..ba620089b
--- /dev/null
+++ b/funnel/static/sass/_label.scss
@@ -0,0 +1,25 @@
+.label-box {
+  margin: 10px 0;
+  padding: 10px;
+
+  .label-box__icon {
+    float: left;
+    margin-top: 15px;
+  }
+  .label-box__icon + .label-box__icon {
+    margin-right: 10px;
+  }
+
+  .label-box__icon--right {
+    float: right;
+  }
+
+  .label-box__heading {
+    margin: 15px 10px;
+    display: inline-block;
+  }
+
+  .label-box__subheading {
+    margin-right: 10px;
+  }
+}
diff --git a/funnel/static/sass/_proposal.scss b/funnel/static/sass/_proposal.scss
index 7dffe7163..e55dc10f5 100644
--- a/funnel/static/sass/_proposal.scss
+++ b/funnel/static/sass/_proposal.scss
@@ -332,7 +332,6 @@
     position: absolute;
     bottom: 10px;
     right: 0;
-    color: #888;
   }
 }
 
diff --git a/funnel/static/sass/app.scss b/funnel/static/sass/app.scss
index bf8028600..300abff5e 100644
--- a/funnel/static/sass/app.scss
+++ b/funnel/static/sass/app.scss
@@ -11,4 +11,5 @@
 @import "proposal";
 @import "proposals";
 @import "schedule";
+@import "label";
 @import "footer";
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 1e4aa525c..4584c8d23 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -9,31 +9,32 @@
 
 {% block contentwrapper %}
 <div class="grid">
-  <div class="grid__col-xs-12 grid__col-md-6">
+  <div class="grid__col-xs-12">
+    <div class="clickable-card card label-box mui--bg-accent" data-href="{{ project.url_for('new_label') }}" title="New label">
+      <div class="card__body mui--text-center">
+        <a class="mui--text-headline mui--text-light" href="{{ project.url_for('new_label') }}" title="New labelset" data-action="New labelset">+ Create new label</a>
+      </div>
+    </div>
+  </div>
+  <div class="grid__col-xs-12">
     <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form">
       {%- for label in labels %}
-        <div class="ui-dragable-box ui-dragable-box--small" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
-          <i class="material-icons mui--text-body1 drag-icon">drag_indicator</i>
+        <div class="ui-dragable-box label-box" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
+          <i class="material-icons mui--text-body1 mui--text-light label-box__icon">drag_indicator</i>
           <input name="id" value="{{ label.id }}" type="hidden" class="id-input">
           <input name="seq" value="{{ label.seq }}" type="hidden" class="seq-input">
           {% if label.has_options %}
-            <h3 class="mui--text-subhead ui-dragable-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
-            <ul class="mui-list--aligned mui-list--unstyled ui-dragable-box__list">
-              {%- for sublabel in label.options %}
-                <li>
-                  <span class="mui--text-subhead"><strong>{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</strong></span>
-                </li>
-              {% else %}
-                <li class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></li>
-              {%- endfor %}
-            </ul>
+            <h3 class="mui--text-subhead mui--text-bold label-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
+            {%- for sublabel in label.options %}
+              <span class="mui--text-subhead label-box__subheading">{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</span>
+            {% else %}
+              <span class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></span>
+            {%- endfor %}
           {% else %}
-            <h3 class="mui--text-subhead ui-dragable-box__heading">{{ label.title }}</h3>
+            <h3 class="mui--text-subhead mui--text-bold label-box__heading">{{ label.title }}</h3>
           {% endif %}
-          <div class="action-btn-wrapper">
-            <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}">{% trans %}Edit label{% endtrans %}</a>
-            <!-- <a class="mui-btn mui-btn--small mui-btn--flat mui-btn--primary" data-href="" title="{% trans %}Add label{% endtrans %}" id="add-label-btn">{% trans %}Archive{% endtrans %}</a> -->
-          </div>
+          <!-- <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('edit') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-body1 mui--text-light">delete</i></a> -->
+          <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}"><i class="material-icons mui--text-body1 mui--text-light">edit</i></a>
         </div>
       {%- endfor %}
       <div class="mui-form form-actions clearfix">
@@ -44,15 +45,6 @@
       </div>
     </form>
   </div>
-  <div class="grid__col-xs-12 grid__col-md-6">
-    <div class="clickable-card card card--small" data-href="{{ project.url_for('new_label') }}" title="New label">
-      <div class="card__body card__body--new mui--bg-accent">
-        <p class="mui--text-headline mui--text-center">
-          <a class="new-btn mui--text-dark " href="{{ project.url_for('new_label') }}" title="New labelset" data-action="New labelset"><span>+</span><br><span>Add new label</span></a>
-        </p>
-      </div>
-    </div>
-  </div>
 </div>
 {% endblock %}
 
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index bbe1a7e8e..a80d1392e 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -10,7 +10,7 @@
 
 {% macro labelformfields(lform, subform=false, empty=false) %}
   {%- if subform %}
-    <div class="ui-dragable-box ui-dragable-box--small" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true">
+    <div class="ui-dragable-box" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true">
       {{ lform.hidden_tag() }}
       <i class="material-icons mui--text-body1 drag-icon">drag_indicator</i>
       {{ renderfield(lform.seq, css_class="seq-input") }}
@@ -20,14 +20,14 @@
     <div><p class="mui-form__error">{{ error }}</p></div>
   {%- endfor %}
   {%- if not empty %}
-    {{ renderfield(lform.title, autofocus=true, css_class="label-title") }}
+    {{ renderfield(lform.title, autofocus=true, css_class="label-form__title-field") }}
   {%- else -%}
-    {{ renderfield(lform.title, autofocus=true, css_class="label-title--close") }}
+    {{ renderfield(lform.title, autofocus=true, css_class="label-form__title-field label-form__title-field--close") }}
   {%- endif %}
   {%- for error in lform.title.errors %}
     <div><p class="mui-form__error">{{ error }}</p></div>
   {%- endfor %}
-    {%- if empty %}<button class="mui-btn--nostyle js-remove-sublabel-form remove-btn"><i class="material-icons mui--text-body1">close</i></button>{%- endif %}
+    {%- if empty %}<button class="mui-btn--nostyle js-remove-sublabel-form label-form__subform__close-btn"><i class="material-icons mui--text-body1">close</i></button>{%- endif %}
     <!-- Add archive button for existing sublabels -->
   {%- if subform %}
     </div>
@@ -44,10 +44,10 @@
   {%- if message %}
     <p class="form-message">{{ message }}</p>
   {%- endif %}
-  <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins mui-form--smaller ">
+  <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins label-form">
     {{ form.hidden_tag() }}
     {{ labelformfields(form) }}
-    <div id="child-form" class="sub-form">
+    <div id="child-form" class="label-form__subform">
       {% if form.edit_obj and form.edit_obj.has_options and subforms %}
         {% for subform in subforms %}
           {{ labelformfields(subform, subform=true) }}
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index e57579b64..29595e585 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -211,7 +211,7 @@
                     {%- for label in proposal.labels %}
                       <span class="label mui--text-caption mui--text-bold" data-labeltxt="{% if label.main_label %}{% if label.main_label.icon_emoji -%}{{ label.main_label.icon_emoji }} {{ label.main_label.title }}{% else -%}{{ label.main_label.title }}{% endif %}{% elif label.icon_emoji -%}{{ label.icon_emoji }} {{ label.title }}{% else -%}{{ label.title }}{% endif %}">{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
                     {%- endfor %}
-                    <i class="material-icons">arrow_drop_down</i>
+                    <i class="material-icons mui--text-light">arrow_drop_down</i>
                   </div>
                   <div id="label-dropdown" class="label-dropdown-wrapper">
                     {{ renderfield(proposal_label_admin_form.formlabels, css_class="label-select-fields") }}

From 3a8f4ebd3968cd4de933a06b63fa0e2a0aa31dad Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Thu, 25 Apr 2019 22:10:53 +0530
Subject: [PATCH 096/125] Minor css updates of label page

---
 funnel/static/css/app.css           |  9 +++++++++
 funnel/static/sass/_label.scss      | 10 ++++++++++
 funnel/templates/labels.html.jinja2 | 12 ++++++------
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index da3efa70f..d63f37066 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -1572,6 +1572,15 @@ body > .proposal-box.ui-draggable {
   margin-right: 10px;
 }
 
+.label-box--new {
+  margin: 15px auto 35px;
+  width: 100%;
+  max-width: 500px;
+}
+.label-box--new a:hover {
+  text-decoration: none;
+}
+
 .footer {
   padding-bottom: 50px;
 }
diff --git a/funnel/static/sass/_label.scss b/funnel/static/sass/_label.scss
index ba620089b..3c57d925d 100644
--- a/funnel/static/sass/_label.scss
+++ b/funnel/static/sass/_label.scss
@@ -23,3 +23,13 @@
     margin-right: 10px;
   }
 }
+
+.label-box--new {
+  margin: 15px auto 35px;
+  width: 100%;
+  max-width: 500px;
+
+  a:hover {
+    text-decoration: none;
+  }
+}
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 4584c8d23..779f0c7cf 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -10,9 +10,9 @@
 {% block contentwrapper %}
 <div class="grid">
   <div class="grid__col-xs-12">
-    <div class="clickable-card card label-box mui--bg-accent" data-href="{{ project.url_for('new_label') }}" title="New label">
+    <div class="clickable-card card label-box label-box--new mui--z2" data-href="{{ project.url_for('new_label') }}" title="New label">
       <div class="card__body mui--text-center">
-        <a class="mui--text-headline mui--text-light" href="{{ project.url_for('new_label') }}" title="New labelset" data-action="New labelset">+ Create new label</a>
+        <a class="mui--text-headline mui--text-light" href="{{ project.url_for('new_label') }}" title="New labelset" data-action="New labelset"><i class="material-icons mui--align-middle mui--text-display1">add</i> Create new label</a>
       </div>
     </div>
   </div>
@@ -24,14 +24,14 @@
           <input name="id" value="{{ label.id }}" type="hidden" class="id-input">
           <input name="seq" value="{{ label.seq }}" type="hidden" class="seq-input">
           {% if label.has_options %}
-            <h3 class="mui--text-subhead mui--text-bold label-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
+            <h3 class="mui--text-title mui--text-bold label-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
             {%- for sublabel in label.options %}
-              <span class="mui--text-subhead label-box__subheading">{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</span>
+              <span class="mui--text-subhead mui--text-light label-box__subheading">{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</span>
             {% else %}
-              <span class="mui--text-subhead"><em>{% trans %}(No labels){% endtrans %}</em></span>
+              <span class="mui--text-subhead mui--text-light"><em>{% trans %}(No labels){% endtrans %}</em></span>
             {%- endfor %}
           {% else %}
-            <h3 class="mui--text-subhead mui--text-bold label-box__heading">{{ label.title }}</h3>
+            <h3 class="mui--text-title mui--text-bold label-box__heading">{{ label.title }}</h3>
           {% endif %}
           <!-- <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('edit') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-body1 mui--text-light">delete</i></a> -->
           <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}"><i class="material-icons mui--text-body1 mui--text-light">edit</i></a>

From fa4d2286666a430e8e1f2e767b773bfd689a26fe Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 01:06:53 +0530
Subject: [PATCH 097/125] calling reorder to fix ordering

---
 funnel/views/label.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index f7da9aaab..1bb15f1ec 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -49,6 +49,7 @@ def new_label(self):
             label.restricted = form.data.get('restricted')
             label.make_name()
             self.obj.labels.append(label)
+            self.obj.labels.reorder()
             db.session.add(label)
 
             for idx, title in enumerate(titlelist):
@@ -141,6 +142,7 @@ def edit(self):
                         subl.make_name()
                         self.obj.project.labels.append(subl)
                         self.obj.options.append(subl)
+                        self.obj.options.reorder()
                         db.session.add(subl)
                 form.populate_obj(self.obj)
             db.session.commit()

From ead9434683d591a5af2b1ac3fc31d7df23836eda Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 01:26:00 +0530
Subject: [PATCH 098/125] saving main label order from manage label page

---
 funnel/forms/label.py               |  7 +------
 funnel/templates/labels.html.jinja2 |  1 -
 funnel/views/label.py               | 15 ++++++++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index 499371829..aef292fe3 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -3,7 +3,7 @@
 from baseframe import __
 import baseframe.forms as forms
 
-__all__ = ['LabelForm', 'LabelSeqForm', 'LabelOptionForm']
+__all__ = ['LabelForm', 'LabelOptionForm']
 
 
 class LabelForm(forms.Form):
@@ -17,11 +17,6 @@ class LabelForm(forms.Form):
         description=__("If checked, only editors and reviewers can apply this label on proposals"))
 
 
-class LabelSeqForm(forms.Form):
-    id = forms.IntegerField("", widget=forms.HiddenInput())
-    seq = forms.IntegerField("", widget=forms.HiddenInput())
-
-
 class LabelOptionForm(forms.Form):
     id = forms.IntegerField("", widget=forms.HiddenInput(), validators=[forms.validators.Optional()])
     title = forms.StringField(__("Option"),
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 779f0c7cf..040cf3d79 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -22,7 +22,6 @@
         <div class="ui-dragable-box label-box" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
           <i class="material-icons mui--text-body1 mui--text-light label-box__icon">drag_indicator</i>
           <input name="id" value="{{ label.id }}" type="hidden" class="id-input">
-          <input name="seq" value="{{ label.seq }}" type="hidden" class="seq-input">
           {% if label.has_options %}
             <h3 class="mui--text-title mui--text-bold label-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
             {%- for sublabel in label.options %}
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 1bb15f1ec..8dfe44b42 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -7,7 +7,7 @@
 
 from .. import app, funnelapp, lastuser
 from ..models import Label, db, Project, Profile
-from ..forms import LabelForm, LabelSeqForm, LabelOptionForm
+from ..forms import LabelForm, LabelOptionForm
 from .mixins import ProjectViewMixin
 from .decorators import legacy_redirect
 
@@ -21,10 +21,15 @@ class ProjectLabelView(ProjectViewMixin, UrlForView, ModelView):
     @lastuser.requires_login
     @requires_permission('edit_project')
     def labels(self):
-        # TODO: Update form to save sequence of main labels
-        form = LabelSeqForm(model=Label, parent=self.obj.parent)
-        print request.values
-        return dict(project=self.obj, labels=self.obj.labels, form=form)
+        if request.method == 'POST':
+            idlist = request.values.getlist('id')
+            for idx, lid in enumerate(idlist, start=1):
+                lbl = Label.query.get(lid)
+                if lbl is not None:
+                    lbl.seq = idx
+                    db.session.commit()
+            flash(_("Your changes have been saved"), category='success')
+        return dict(project=self.obj, labels=self.obj.labels)
 
     @route('new', methods=['GET', 'POST'])
     @lastuser.requires_login

From d5c260d93fe1a4debe97ff51b6e6b03c88e2ef22 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 09:43:14 +0530
Subject: [PATCH 099/125] added csrf protection to labels reorder form

---
 funnel/templates/labels.html.jinja2 | 1 +
 funnel/views/label.py               | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 040cf3d79..7323fd54b 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -18,6 +18,7 @@
   </div>
   <div class="grid__col-xs-12">
     <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form">
+      {{ form.hidden_tag() }}
       {%- for label in labels %}
         <div class="ui-dragable-box label-box" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
           <i class="material-icons mui--text-body1 mui--text-light label-box__icon">drag_indicator</i>
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 8dfe44b42..4ba73adaf 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -3,7 +3,7 @@
 from flask import flash, redirect, g, request
 from werkzeug.datastructures import MultiDict
 from coaster.views import render_with, requires_permission, route, UrlForView, ModelView
-from baseframe import _
+from baseframe import _, forms
 
 from .. import app, funnelapp, lastuser
 from ..models import Label, db, Project, Profile
@@ -21,7 +21,8 @@ class ProjectLabelView(ProjectViewMixin, UrlForView, ModelView):
     @lastuser.requires_login
     @requires_permission('edit_project')
     def labels(self):
-        if request.method == 'POST':
+        form = forms.Form()
+        if form.validate_on_submit():
             idlist = request.values.getlist('id')
             for idx, lid in enumerate(idlist, start=1):
                 lbl = Label.query.get(lid)
@@ -29,7 +30,7 @@ def labels(self):
                     lbl.seq = idx
                     db.session.commit()
             flash(_("Your changes have been saved"), category='success')
-        return dict(project=self.obj, labels=self.obj.labels)
+        return dict(project=self.obj, labels=self.obj.labels, form=form)
 
     @route('new', methods=['GET', 'POST'])
     @lastuser.requires_login

From bb068fe7e2125377dcb6bdbd26330f789cfa7818 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 09:59:14 +0530
Subject: [PATCH 100/125] addded reordering of sublabels

---
 funnel/views/label.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index 4ba73adaf..5c2b3e6f0 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -110,14 +110,14 @@ def loader(self, profile, project, label):
     def edit(self):
         emptysubform = LabelOptionForm(MultiDict({}))
         subforms = []
-        if self.obj.main_label:
-            # It's a sublabel
-            form = LabelOptionForm(obj=self.obj, model=Label, parent=self.obj.project)
-        else:
+        if self.obj.has_options:
             form = LabelForm(obj=self.obj, model=Label, parent=self.obj.project)
             if self.obj.has_options:
                 for subl in self.obj.options:
                     subforms.append(LabelOptionForm(obj=subl, parent=self.obj.project))
+        else:
+            flash(_("Only main labels can be edited"), category='error')
+            return redirect(self.obj.project.url_for('labels'), code=303)
 
         if form.validate_on_submit():
             idlist = request.values.getlist('id')
@@ -134,6 +134,7 @@ def edit(self):
                     subl = Label.query.filter_by(project=self.obj.project, id=idlist[idx]).first()
                     subl.title = titlelist[idx]
                     subl.icon_emoji = emojilist[idx]
+                    subl.seq = idx + 1
                 else:
                     subform = LabelOptionForm(MultiDict({
                         'title': titlelist[idx], 'icon_emoji': emojilist[idx]

From 72bd94a51ff7dc3414018fda0b627050b99d1150 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 10:11:41 +0530
Subject: [PATCH 101/125] added viewsfor delete and archive

---
 funnel/views/label.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index 5c2b3e6f0..0c0aa0a46 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -4,6 +4,7 @@
 from werkzeug.datastructures import MultiDict
 from coaster.views import render_with, requires_permission, route, UrlForView, ModelView
 from baseframe import _, forms
+from baseframe.forms import render_delete_sqla
 
 from .. import app, funnelapp, lastuser
 from ..models import Label, db, Project, Profile
@@ -160,6 +161,35 @@ def edit(self):
     @lastuser.requires_login
     @requires_permission('admin')
     def archive(self):
+        form = forms.Form()
+        if form.validate_on_submit():
+            self.obj.archived = True
+            db.session.commit()
+            flash(_("The label has been archived"), category='success')
+        else:
+            flash(_("CSRF token is missing"), category='error')
+        return redirect(self.obj.project.url_for('labels'), code=303)
+
+    @route('delete', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @requires_permission('admin')
+    def delete(self):
+        has_proposals = False
+        if self.obj.has_options:
+            for subl in self.obj.options:
+                if not subl.archived and len(subl.proposals) > 0:
+                    has_proposals = True
+                    break
+        else:
+            if len(self.obj.proposals) > 0:
+                has_proposals = True
+        if has_proposals:
+            flash(_("Labels that have been assigned to proposals cannot be deleted"), category='error')
+        else:
+            return render_delete_sqla(self.obj, db, title=u"Confirm delete",
+                message=_(u"Delete label “{title}”? This cannot be undone".format(title=self.obj.title)),
+                success=_(u"You have deleted the label “{title}”".format(title=self.obj.title)),
+                next=self.obj.project.url_for('labels'))
         return redirect(self.obj.project.url_for('labels'), code=303)
 
 

From fe8c47857861330e5699c066789079628be014b9 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 12:37:44 +0530
Subject: [PATCH 102/125] added `has_proposals` to label model

---
 funnel/models/label.py                      |  7 +++++++
 funnel/templates/labels.html.jinja2         |  6 +++++-
 funnel/views/label.py                       |  2 +-
 tests/integration/views/test_label_views.py | 15 +++++++++++++++
 tests/unit/models/test_label.py             |  7 +++++++
 5 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/integration/views/test_label_views.py

diff --git a/funnel/models/label.py b/funnel/models/label.py
index 05d489920..6c482f0b2 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -88,6 +88,13 @@ class Label(BaseScopedNameMixin, db.Model):
     def form_label_text(self):
         return self.icon_emoji + " " + self.title if self.icon_emoji is not None else self.title
 
+    @property
+    def has_proposals(self):
+        if not self.has_options:
+            return bool(self.proposals)
+        else:
+            return any(bool(option.proposals) for option in self.options)
+
     @hybrid_property
     def restricted(self):
         return self.main_label._restricted if self.main_label else self._restricted
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 7323fd54b..cc54e499a 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -33,7 +33,11 @@
           {% else %}
             <h3 class="mui--text-title mui--text-bold label-box__heading">{{ label.title }}</h3>
           {% endif %}
-          <!-- <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('edit') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-body1 mui--text-light">delete</i></a> -->
+          {% if label.has_proposals %}
+            <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('archive') }}" title="{% trans %}Archive{% endtrans %}"><i class="material-icons mui--text-body1 mui--text-light">archive</i></a>
+          {% else %}
+            <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('delete') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-body1 mui--text-light">delete</i></a>
+          {% endif %}
           <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}"><i class="material-icons mui--text-body1 mui--text-light">edit</i></a>
         </div>
       {%- endfor %}
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 0c0aa0a46..60891378f 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -101,7 +101,7 @@ def loader(self, profile, project, label):
                 Profile.name == profile, Project.name == project
             ).first_or_404()
         label = self.model.query.filter_by(project=proj, name=label).first_or_404()
-        g.profile = label.project.profile
+        g.profile = proj.profile
         return label
 
     @route('edit', methods=['GET', 'POST'])
diff --git a/tests/integration/views/test_label_views.py b/tests/integration/views/test_label_views.py
new file mode 100644
index 000000000..babad1d10
--- /dev/null
+++ b/tests/integration/views/test_label_views.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from funnel.models import Label
+
+
+class TestLabelViews(object):
+    def test_label_archive(self, test_client, test_db, new_user, new_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp = c.post(new_label.url_for('archive'), follow_redirects=True)
+            label = Label.query.get(new_label.id)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"The label has been archived" in resp.data.decode('utf-8')
+            assert label.archived is True
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index 1f62af68b..b6758138c 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -61,3 +61,10 @@ def test_label_icon(self, test_client, test_db, new_label):
         test_db.session.commit()
         assert new_label.title == "Label B"
         assert new_label.icon == "LB"
+
+    def test_label_archived(self, test_client, test_db, new_label):
+        # if the label has icon_emoji, that's get set as icon
+        assert new_label.archived is False
+        new_label.archived = True
+        test_db.session.commit()
+        assert new_label.archived is True

From faf482363e553378b5c2540124db69edca39c8f7 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 13:40:05 +0530
Subject: [PATCH 103/125] fix edit form

---
 funnel/views/label.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index 60891378f..75333e4a8 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -111,7 +111,7 @@ def loader(self, profile, project, label):
     def edit(self):
         emptysubform = LabelOptionForm(MultiDict({}))
         subforms = []
-        if self.obj.has_options:
+        if not self.obj.main_label:
             form = LabelForm(obj=self.obj, model=Label, parent=self.obj.project)
             if self.obj.has_options:
                 for subl in self.obj.options:
@@ -152,8 +152,10 @@ def edit(self):
                         self.obj.options.append(subl)
                         self.obj.options.reorder()
                         db.session.add(subl)
-                form.populate_obj(self.obj)
+
+            form.populate_obj(self.obj)
             db.session.commit()
+
             return redirect(self.obj.project.url_for('labels'), code=303)
         return dict(title="Edit label", form=form, subforms=subforms, emptysubform=emptysubform, project=self.obj.project)
 

From 0191b36a15e31facbeea549bf67a4eea8d69c279 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 14:41:49 +0530
Subject: [PATCH 104/125] repalce hyphne in permission name

---
 funnel/models/project.py        | 2 +-
 funnel/models/proposal.py       | 2 +-
 funnel/views/proposal.py        | 2 +-
 tests/unit/models/test_label.py | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/funnel/models/project.py b/funnel/models/project.py
index 7058c97c4..5866e4d20 100644
--- a/funnel/models/project.py
+++ b/funnel/models/project.py
@@ -437,7 +437,7 @@ def permissions(self, user, inherited=None):
                     'confirm-proposal',
                     'view_voteinfo',
                     'view_status',
-                    'edit-proposal',
+                    'edit_proposal',
                     'delete-proposal',
                     'edit-schedule',
                     'new-session',
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index 1133f24f7..fab4058fb 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -285,7 +285,7 @@ def permissions(self, user, inherited=None):
             if user == self.owner:
                 perms.update([
                     'view-proposal',
-                    'edit-proposal',
+                    'edit_proposal',
                     'delete-proposal',  # FIXME: Prevent deletion of confirmed proposals
                     'submit-proposal',  # For workflows, to confirm the form is ready for submission (from draft state)
                     'transfer-proposal',
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index c6935c914..c5b245344 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -168,7 +168,7 @@ def json(self):
 
     @route('edit', methods=['GET', 'POST'])
     @lastuser.requires_login
-    @requires_permission('edit-proposal')
+    @requires_permission('edit_proposal')
     def edit(self):
         form = ProposalForm(obj=self.obj, model=Proposal, parent=self.obj.project)
         if self.obj.user != g.user:
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index b6758138c..fe39bdda4 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -63,7 +63,6 @@ def test_label_icon(self, test_client, test_db, new_label):
         assert new_label.icon == "LB"
 
     def test_label_archived(self, test_client, test_db, new_label):
-        # if the label has icon_emoji, that's get set as icon
         assert new_label.archived is False
         new_label.archived = True
         test_db.session.commit()

From b2f899a3b80f8d0cf6097df77bbde65de688be8a Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 26 Apr 2019 14:41:53 +0530
Subject: [PATCH 105/125] Add confirmation dialog for delete and archive

---
 funnel/static/css/app.css           | 14 +++++++++++---
 funnel/static/sass/_label.scss      | 16 +++++++++++++---
 funnel/templates/labels.html.jinja2 | 24 ++++++++++++++++--------
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index d63f37066..d405b2675 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -1558,19 +1558,27 @@ body > .proposal-box.ui-draggable {
   float: left;
   margin-top: 15px;
 }
-.label-box .label-box__icon + .label-box__icon {
-  margin-right: 10px;
-}
 .label-box .label-box__icon--right {
   float: right;
+  padding: 0 15px;
+  box-shadow: none;
+  border: none;
+  cursor: pointer;
 }
 .label-box .label-box__heading {
   margin: 15px 10px;
   display: inline-block;
 }
+.label-box .sublabel-wrapper {
+  display: inline-block;
+  max-width: 80%;
+}
 .label-box .label-box__subheading {
   margin-right: 10px;
 }
+.label-box .label-box__action {
+  float: right;
+}
 
 .label-box--new {
   margin: 15px auto 35px;
diff --git a/funnel/static/sass/_label.scss b/funnel/static/sass/_label.scss
index 3c57d925d..e392cb887 100644
--- a/funnel/static/sass/_label.scss
+++ b/funnel/static/sass/_label.scss
@@ -6,12 +6,13 @@
     float: left;
     margin-top: 15px;
   }
-  .label-box__icon + .label-box__icon {
-    margin-right: 10px;
-  }
 
   .label-box__icon--right {
     float: right;
+    padding: 0 15px;
+    box-shadow: none;
+    border: none;
+    cursor: pointer;
   }
 
   .label-box__heading {
@@ -19,9 +20,18 @@
     display: inline-block;
   }
 
+  .sublabel-wrapper {
+    display: inline-block;
+    max-width: 80%
+  }
+
   .label-box__subheading {
     margin-right: 10px;
   }
+
+  .label-box__action {
+    float: right;
+  }
 }
 
 .label-box--new {
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index cc54e499a..56374225d 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -25,20 +25,28 @@
           <input name="id" value="{{ label.id }}" type="hidden" class="id-input">
           {% if label.has_options %}
             <h3 class="mui--text-title mui--text-bold label-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
-            {%- for sublabel in label.options %}
-              <span class="mui--text-subhead mui--text-light label-box__subheading">{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</span>
-            {% else %}
-              <span class="mui--text-subhead mui--text-light"><em>{% trans %}(No labels){% endtrans %}</em></span>
-            {%- endfor %}
+            <div class="sublabel-wrapper">
+              {%- for sublabel in label.options %}
+                <span class="mui--text-subhead mui--text-light label-box__subheading">{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</span>
+              {% else %}
+                <span class="mui--text-subhead mui--text-light"><em>{% trans %}(No labels){% endtrans %}</em></span>
+              {%- endfor %}
+            </div>
           {% else %}
             <h3 class="mui--text-title mui--text-bold label-box__heading">{{ label.title }}</h3>
           {% endif %}
           {% if label.has_proposals %}
-            <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('archive') }}" title="{% trans %}Archive{% endtrans %}"><i class="material-icons mui--text-body1 mui--text-light">archive</i></a>
+            <form method="POST" action="{{ label.url_for('archive') }}" class="label-box__action">
+              {{ form.hidden_tag() }}
+              <button type="submit" class="label-box__icon label-box__icon--right" href="{{ label.url_for('archive') }}" title="{% trans %}Archive{% endtrans %}"><i class="material-icons mui--text-title mui--text-light" onclick="return confirm('Are you sure you want to archive')">archive</i></button>
+            </form>
           {% else %}
-            <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('delete') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-body1 mui--text-light">delete</i></a>
+            <form method="POST" action="{{ label.url_for('delete') }}" class="label-box__action">
+              {{ form.hidden_tag() }}
+              <button class="label-box__icon label-box__icon--right" href="{{ label.url_for('delete') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-title mui--text-light" onclick="return confirm('Are you sure you want to delete')">delete</i></button>
+            </form>
           {% endif %}
-          <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}"><i class="material-icons mui--text-body1 mui--text-light">edit</i></a>
+            <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}"><i class="material-icons mui--text-title mui--text-light">edit</i></a>
         </div>
       {%- endfor %}
       <div class="mui-form form-actions clearfix">

From e28132b59706f0505402ddae048f343289d45001 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 14:48:20 +0530
Subject: [PATCH 106/125] fixed label delete view

---
 funnel/views/label.py | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index 75333e4a8..0563e8fdf 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -176,22 +176,12 @@ def archive(self):
     @lastuser.requires_login
     @requires_permission('admin')
     def delete(self):
-        has_proposals = False
-        if self.obj.has_options:
-            for subl in self.obj.options:
-                if not subl.archived and len(subl.proposals) > 0:
-                    has_proposals = True
-                    break
-        else:
-            if len(self.obj.proposals) > 0:
-                has_proposals = True
-        if has_proposals:
+        if self.obj.has_proposals:
             flash(_("Labels that have been assigned to proposals cannot be deleted"), category='error')
         else:
-            return render_delete_sqla(self.obj, db, title=u"Confirm delete",
-                message=_(u"Delete label “{title}”? This cannot be undone".format(title=self.obj.title)),
-                success=_(u"You have deleted the label “{title}”".format(title=self.obj.title)),
-                next=self.obj.project.url_for('labels'))
+            db.session.delete(self.obj)
+            db.session.commit()
+            flash(_("The label has been deleted"), category='success')
         return redirect(self.obj.project.url_for('labels'), code=303)
 
 

From e3ab13cc4268815e7aa44026c74c6499ca8073d5 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 15:52:49 +0530
Subject: [PATCH 107/125] using name instead of id

---
 funnel/forms/label.py               |  4 ++--
 funnel/templates/labels.html.jinja2 |  2 +-
 funnel/views/label.py               | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/funnel/forms/label.py b/funnel/forms/label.py
index aef292fe3..80623bbe1 100644
--- a/funnel/forms/label.py
+++ b/funnel/forms/label.py
@@ -7,7 +7,7 @@
 
 
 class LabelForm(forms.Form):
-    id = forms.IntegerField("", widget=forms.HiddenInput(), validators=[forms.validators.Optional()])
+    name = forms.StringField("", widget=forms.HiddenInput(), validators=[forms.validators.Optional()])
     title = forms.StringField(__("Label"),
         validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
     icon_emoji = forms.StringField("")
@@ -18,7 +18,7 @@ class LabelForm(forms.Form):
 
 
 class LabelOptionForm(forms.Form):
-    id = forms.IntegerField("", widget=forms.HiddenInput(), validators=[forms.validators.Optional()])
+    name = forms.StringField("", widget=forms.HiddenInput(), validators=[forms.validators.Optional()])
     title = forms.StringField(__("Option"),
         validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
     icon_emoji = forms.StringField("")
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 56374225d..3b131af8d 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -22,7 +22,7 @@
       {%- for label in labels %}
         <div class="ui-dragable-box label-box" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
           <i class="material-icons mui--text-body1 mui--text-light label-box__icon">drag_indicator</i>
-          <input name="id" value="{{ label.id }}" type="hidden" class="id-input">
+          <input name="name" value="{{ label.name }}" type="hidden" class="id-input">
           {% if label.has_options %}
             <h3 class="mui--text-title mui--text-bold label-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
             <div class="sublabel-wrapper">
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 0563e8fdf..3e5e62dbc 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -24,9 +24,9 @@ class ProjectLabelView(ProjectViewMixin, UrlForView, ModelView):
     def labels(self):
         form = forms.Form()
         if form.validate_on_submit():
-            idlist = request.values.getlist('id')
-            for idx, lid in enumerate(idlist, start=1):
-                lbl = Label.query.get(lid)
+            namelist = request.values.getlist('name')
+            for idx, lname in enumerate(namelist, start=1):
+                lbl = Label.query.filter_by(project=self.obj, name=lname).first()
                 if lbl is not None:
                     lbl.seq = idx
                     db.session.commit()
@@ -121,18 +121,18 @@ def edit(self):
             return redirect(self.obj.project.url_for('labels'), code=303)
 
         if form.validate_on_submit():
-            idlist = request.values.getlist('id')
+            namelist = request.values.getlist('name')
             titlelist = request.values.getlist('title')
             emojilist = request.values.getlist('icon_emoji')
 
-            idlist.pop(0)
+            namelist.pop(0)
             titlelist.pop(0)
             emojilist.pop(0)
 
             for idx, title in enumerate(titlelist):
-                if idlist[idx]:
+                if namelist[idx]:
                     # existing sublabel
-                    subl = Label.query.filter_by(project=self.obj.project, id=idlist[idx]).first()
+                    subl = Label.query.filter_by(project=self.obj.project, name=namelist[idx]).first()
                     subl.title = titlelist[idx]
                     subl.icon_emoji = emojilist[idx]
                     subl.seq = idx + 1

From 38fde91dc70d29dd1a9c11526fe3130163426877 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 15:53:09 +0530
Subject: [PATCH 108/125] not reusing forms for label

---
 funnel/forms/proposal.py | 54 ++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index f6120a8ca..91c125875 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -10,7 +10,7 @@
     'ProposalMoveForm', 'ProposalLabelsAdminForm']
 
 
-def proposal_label_form(project, proposal, for_admin=False):
+def proposal_label_form(project, proposal):
     """
     Returns a label form for the given project and proposal.
     """
@@ -18,27 +18,43 @@ class ProposalLabelForm(forms.Form):
         pass
 
     for label in project.labels:
-        field_kwargs = {
-            'label': label.form_label_text,
-            'description': label.description,
-            'validators': [forms.validators.DataRequired(__("Please select one"))] if label.required else [],
-        }
-        if label.has_options:
-            FieldType = forms.RadioField
-            field_kwargs['choices'] = [(option.name, option.title) for option in label.options if not option.archived]
-        else:
-            FieldType = forms.BooleanField
-
-        if for_admin:
-            if not label.archived and (label.restricted or not label.has_options):
-                setattr(ProposalLabelForm, label.name, FieldType(**field_kwargs))
-        else:
-            if label.has_options and not label.archived and not label.restricted:
-                setattr(ProposalLabelForm, label.name, FieldType(**field_kwargs))
+        if label.is_main and not label.archived and not label.restricted:
+            setattr(ProposalLabelForm, label.name, forms.RadioField(
+                label.form_label_text,
+                description=label.description,
+                validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
+                choices=[(option.name, option.title) for option in label.options if not option.archived]
+            ))
 
     return ProposalLabelForm(obj=proposal.formlabels if proposal else None, meta={'csrf': False})
 
 
+def proposal_label_admin_form(project, proposal):
+    """
+    Returns a label form to use in admin panel for given project and proposal
+    """
+    class ProposalLabelAdminForm(forms.Form):
+        pass
+
+    for label in project.labels:
+        if not label.archived and (label.restricted or not label.has_options):
+            form_kwargs = {}
+            if label.has_options:
+                FieldType = forms.RadioField
+                form_kwargs['choices'] = [(option.name, option.title) for option in label.options if not option.archived]
+            else:
+                FieldType = forms.BooleanField
+
+            setattr(ProposalLabelAdminForm, label.name, FieldType(
+                label.form_label_text,
+                description=label.description,
+                validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
+                **form_kwargs
+            ))
+
+    return ProposalLabelAdminForm(obj=proposal.formlabels if proposal else None, meta={'csrf': False})
+
+
 class TransferProposal(forms.Form):
     userid = forms.UserSelectField(__("Transfer to"), validators=[forms.validators.DataRequired()])
 
@@ -54,7 +70,7 @@ class ProposalLabelsAdminForm(forms.Form):
     formlabels = forms.FormField(forms.Form, __("Labels"))
 
     def set_queries(self):
-        self.formlabels.form = proposal_label_form(project=self.edit_parent, proposal=self.edit_obj, for_admin=True)
+        self.formlabels.form = proposal_label_admin_form(project=self.edit_parent, proposal=self.edit_obj)
 
 
 class ProposalForm(forms.Form):

From 5dfaaf727f6355c710731414738b99b1eb6f2eb5 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 16:04:11 +0530
Subject: [PATCH 109/125] moved label assignment from proposal model to label
 model

---
 funnel/models/label.py          | 25 ++++++++++++++++++++++++-
 funnel/models/proposal.py       | 23 -----------------------
 tests/unit/models/test_label.py |  4 ++--
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index 6c482f0b2..363416e29 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -128,7 +128,7 @@ def archived(cls):
 
     @hybrid_property
     def has_options(self):
-        return len(self.options) != 0
+        return bool(self.options)
 
     @has_options.expression
     def has_options(cls):
@@ -176,6 +176,29 @@ def roles_for(self, actor=None, anchors=()):
         roles.update(self.project.roles_for(actor, anchors))
         return roles
 
+    def apply_to(self, proposal):
+        if self.has_options:
+            raise ValueError("This label requires one of its options to be used")
+        if self in proposal.labels:
+            return
+
+        if self.main_label is not None:
+            existing_labels = set(self.main_label.options).intersection(set(proposal.labels))
+            if existing_labels:
+                # the parent label is in radio mode and one of it's labels are
+                # already assigned to this proposal. We need to
+                # remove the older label and assign given label.
+                for elabel in existing_labels:
+                    proposal.labels.remove(elabel)
+        # we can assign label to proposal
+        proposal.labels.append(self)
+
+    def remove_from(self, proposal):
+        if self.has_options:
+            raise ValueError("This label requires one of its options to be removed")
+        if self in proposal.labels:
+            proposal.labels.remove(self)
+
 
 class ProposalLabelProxyWrapper(object):
     def __init__(self, obj):
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index fab4058fb..dfcdfc621 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -118,9 +118,6 @@ class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
         'reviewer': {
             'read': {
                 'email', 'phone'
-            },
-            'call': {
-                'assign_label'
             }
         }
     }
@@ -305,26 +302,6 @@ def roles_for(self, actor=None, anchors=()):
             roles.remove('reader')  # https://github.com/hasgeek/funnel/pull/220#discussion_r168724439
         return roles
 
-    def assign_label(self, label):
-        """
-        Assign the given label to current proposal
-        """
-        if label in self.labels:
-            return
-        if label.has_options:
-            raise ValueError("This label requires one of its options to be used")
-
-        if label.main_label is not None:
-            existing_labels = set(label.main_label.options).intersection(set(self.labels))
-            if existing_labels:
-                # the parent label is in radio mode and one of it's labels are
-                # already assigned to this proposal. We need to
-                # remove the older label and assign given label.
-                for elabel in existing_labels:
-                    self.labels.remove(elabel)
-        # label is not in radio mode, so we can assign label to proposal
-        self.labels.append(label)
-
 
 class ProposalRedirect(TimestampMixin, db.Model):
     __tablename__ = 'proposal_redirect'
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index fe39bdda4..93d2de31f 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -40,10 +40,10 @@ def test_proposal_assignment_radio(self, test_client, test_db, new_main_label, n
         # Parent labels are always in radio mode
         label_a1 = new_main_label.options[0]
         label_a2 = new_main_label.options[1]
-        new_proposal.assign_label(label_a1)
+        label_a1.apply_to(new_proposal)
         assert label_a1 in new_proposal.labels
 
-        new_proposal.assign_label(label_a2)
+        label_a2.apply_to(new_proposal
         # because new_main_label is in radio mode,
         # label_a2 will replace label_a1
         assert label_a1 not in new_proposal.labels

From 5de04a7af8ed5e8399dfefd163b27d4424fea5ec Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 26 Apr 2019 16:12:37 +0530
Subject: [PATCH 110/125] Change delete and archive to ajax post

---
 funnel/templates/labels.html.jinja2   | 42 ++++++++++++++++++++++-----
 funnel/templates/proposal.html.jinja2 |  2 +-
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index 56374225d..668103d90 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -36,15 +36,9 @@
             <h3 class="mui--text-title mui--text-bold label-box__heading">{{ label.title }}</h3>
           {% endif %}
           {% if label.has_proposals %}
-            <form method="POST" action="{{ label.url_for('archive') }}" class="label-box__action">
-              {{ form.hidden_tag() }}
-              <button type="submit" class="label-box__icon label-box__icon--right" href="{{ label.url_for('archive') }}" title="{% trans %}Archive{% endtrans %}"><i class="material-icons mui--text-title mui--text-light" onclick="return confirm('Are you sure you want to archive')">archive</i></button>
-            </form>
+            <a class="label-box__icon label-box__icon--right js-delete-btn" href="{{ label.url_for('archive') }}" title="{% trans %}Archive{% endtrans %}"><i class="material-icons mui--text-title mui--text-light">archive</i></a>
           {% else %}
-            <form method="POST" action="{{ label.url_for('delete') }}" class="label-box__action">
-              {{ form.hidden_tag() }}
-              <button class="label-box__icon label-box__icon--right" href="{{ label.url_for('delete') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-title mui--text-light" onclick="return confirm('Are you sure you want to delete')">delete</i></button>
-            </form>
+            <a class="label-box__icon label-box__icon--right js-delete-btn" href="{{ label.url_for('delete') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-title mui--text-light">delete</i></a>
           {% endif %}
             <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}"><i class="material-icons mui--text-title mui--text-light">edit</i></a>
         </div>
@@ -78,6 +72,38 @@
         });
       }
       $("#label-form").each(applySortable);
+
+      $('.js-delete-btn').click(function(event) {
+        event.preventDefault();
+        var btnTitle = $(this).attr('title').toLowerCase();
+        var url = $(this).attr('href');
+        var text = "Are you sure you want to " + btnTitle;
+        var csrftoken = 'csrf_token=' + document.head.querySelector("[name=csrf-token]").content;
+        if(window.confirm(text)) {
+          $.ajax({
+            type: 'POST',
+            url: url,
+            data : csrftoken,
+            success: function() {
+              window.location.href = window.location.href;
+            },
+            error(response) {
+              var errorMsg = '';
+              if (response.readyState === 4) {
+                if (response.status === 500) {
+                  errorMsg ='Internal Server Error. Please reload and try again.';
+                } else {
+                  errorMsg = JSON.parse(response.responseText).error_description;
+                }
+              } else {
+                errorMsg = 'Unable to connect. Please reload and try again.';
+              }
+              window.toastr.error(errorMsg);
+            }
+          });
+        }
+      })
+
     });
   </script>
 {% endblock %}
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 29595e585..00847e6c4 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -209,7 +209,7 @@
                   <p class="mui--text-title">Labels</p>
                   <div class="selected-label" id="label-select">
                     {%- for label in proposal.labels %}
-                      <span class="label mui--text-caption mui--text-bold" data-labeltxt="{% if label.main_label %}{% if label.main_label.icon_emoji -%}{{ label.main_label.icon_emoji }} {{ label.main_label.title }}{% else -%}{{ label.main_label.title }}{% endif %}{% elif label.icon_emoji -%}{{ label.icon_emoji }} {{ label.title }}{% else -%}{{ label.title }}{% endif %}">{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
+                      <span class="label mui--text-caption mui--text-bold" data-labeltxt="{% if label.main_label %}{% if label.main_label.icon_emoji -%}{{ label.main_label.icon_emoji }} {{ label.main_label.title }}{% else -%}{{ label.main_label.title }}{% endif %}{% elif label.icon_emoji -%}{{ label.icon_emoji }} {{ label.title }}{% else -%}{{ label.title }}{% endif %}">{% if label.main_label %}{% if label.main_label.icon_emoji %}{{ label.main_label.icon_emoji }} {% endif %} {{ label.main_label.title }}: {% endif %}{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %} {{ label.title }}</span>
                     {%- endfor %}
                     <i class="material-icons mui--text-light">arrow_drop_down</i>
                   </div>

From 8f18f14452aef863d0f33645e939ea58ab7c4d48 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 16:43:14 +0530
Subject: [PATCH 111/125] fixed migration

---
 funnel/models/label.py                        |  4 ++
 funnel/views/label.py                         |  2 +-
 .../versions/0b25df40d307_add_labels.py       |  2 +-
 .../e2be4ab896d3_migrate_old_labels.py        | 56 +++++++++++--------
 tests/conftest.py                             |  2 +-
 5 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index 363416e29..b8e63b4fb 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -134,6 +134,10 @@ def has_options(self):
     def has_options(cls):
         return exists().where(Label.main_label_id == cls.id)
 
+    @property
+    def is_main_label(self):
+        return not self.main_label
+
     @hybrid_property
     def required(self):
         return self._required if self.has_options else False
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 3e5e62dbc..8d8319d2c 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -111,7 +111,7 @@ def loader(self, profile, project, label):
     def edit(self):
         emptysubform = LabelOptionForm(MultiDict({}))
         subforms = []
-        if not self.obj.main_label:
+        if self.obj.is_main_label:
             form = LabelForm(obj=self.obj, model=Label, parent=self.obj.project)
             if self.obj.has_options:
                 for subl in self.obj.options:
diff --git a/migrations/versions/0b25df40d307_add_labels.py b/migrations/versions/0b25df40d307_add_labels.py
index 8a3abd8ef..eea345926 100644
--- a/migrations/versions/0b25df40d307_add_labels.py
+++ b/migrations/versions/0b25df40d307_add_labels.py
@@ -32,7 +32,7 @@ def upgrade():
         sa.ForeignKeyConstraint(['main_label_id'], ['label.id'], ondelete='CASCADE'),
         sa.ForeignKeyConstraint(['project_id'], ['project.id'], ondelete='CASCADE'),
         sa.PrimaryKeyConstraint('id'),
-        sa.UniqueConstraint('main_label_id', 'name')
+        sa.UniqueConstraint('project_id', 'name')
     )
     op.create_table('proposal_label',
         sa.Column('proposal_id', sa.Integer(), nullable=False),
diff --git a/migrations/versions/e2be4ab896d3_migrate_old_labels.py b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
index 0896226cd..f531cfa38 100644
--- a/migrations/versions/e2be4ab896d3_migrate_old_labels.py
+++ b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
@@ -73,42 +73,44 @@ def upgrade():
         if sec_count > 0:
             # the project has some sections
             # create section labelset for the project
-            labset = conn.execute(label.insert().values({
+            sections_label = conn.execute(label.insert().values({
                     'project_id': proj['id'], 'name': u"section", 'title': u"Section",
                     'seq': 1, 'description': u"", 'restricted': False, 'archived': False,
-                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+                    'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
                 }).returning(label.c.id)).first()
 
             sections = conn.execute(section.select().where(section.c.project_id == proj['id']))
             for index, sec in enumerate(sections, start=1):
                 lab = conn.execute(label.insert().values({
-                    'main_label_id': labset[0],
+                    'main_label_id': sections_label[0],
                     'project_id': proj['id'], 'name': sec['name'], 'title': sec['title'],
                     'seq': index, 'description': u"", 'restricted': False, 'archived': False,
-                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+                    'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
                 }).returning(label.c.id, label.c.name)).first()
 
+                # FIXME: This will miss proposals in a project linked to sections in another project
+                # -- an error condition resulting from proposals that have been moved around
                 proposals = conn.execute(
                         proposal.select().where(proposal.c.section_id == sec['id']).where(proposal.c.project_id == sec['project_id'])
                     )
                 for prop in proposals:
                     pl = conn.execute(proposal_label.insert().values({
-                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
+                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
                     }))
 
         # technical level
-        labset = conn.execute(label.insert().values({
-            'project_id': proj['id'], 'name': u"technical-level", 'title': u"Technical Level",
-            'seq': 1, 'description': u"", 'restricted': False, 'archived': False,
-            'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+        techlevel_label = conn.execute(label.insert().values({
+            'project_id': proj['id'], 'name': u"technical-level", 'title': u"Technical level",
+            'seq': 2, 'description': u"", 'restricted': False, 'archived': False,
+            'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
         }).returning(label.c.id)).first()
-        tl_list = [('beginner', "Beginner"), ('intermediate', "Intermediate"), ('advanced', "Advanced")]
-        for index, tl in enumerate(tl_list):
+        tl_list = [(u'beginner', u"Beginner"), (u'intermediate', u"Intermediate"), (u'advanced', u"Advanced")]
+        for index, tl in enumerate(tl_list, start=1):
             tl_name, tl_title = tl
             lab = conn.execute(label.insert().values({
-                    'project_id': proj['id'], 'name': tl_name, 'title': tl_title, 'main_label_id': labset[0],
+                    'project_id': proj['id'], 'name': tl_name, 'title': tl_title, 'main_label_id': techlevel_label[0],
                     'seq': index, 'description': u"", 'restricted': False, 'archived': False,
-                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+                    'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
                 }).returning(label.c.id, label.c.name)).first()
 
             proposals = conn.execute(
@@ -116,22 +118,30 @@ def upgrade():
                 )
             for prop in proposals:
                 pl = conn.execute(proposal_label.insert().values({
-                    'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
+                    'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
                 }))
 
         # session type
-        labset = conn.execute(label.insert().values({
-                'project_id': proj['id'], 'name': u"session-type", 'title': u"Session Type",
-                'seq': 1, 'description': u"", 'restricted': False, 'archived': False,
-                'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+        sessiontype_label = conn.execute(label.insert().values({
+                'project_id': proj['id'], 'name': u"session-type", 'title': u"Session type",
+                'seq': 3, 'description': u"", 'restricted': False, 'archived': False,
+                'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
             }).returning(label.c.id)).first()
-        st_list = [('lecture', "Lecture"), ('demo', "Demo"), ('tutorial', "Tutorial"), ('workshop', "Workshop"), ('discussion', "Discussion"), ('panel', "Panel")]
-        for index, st in enumerate(st_list):
+
+        st_list = [(u'lecture', u"Lecture"), (u'demo', u"Demo"), (u'tutorial', u"Tutorial"),
+            (u'workshop', u"Workshop"), (u'discussion', u"Discussion"), (u'panel', u"Panel")]
+
+        for index, st in enumerate(st_list, start=1):
             st_name, st_title = st
+            duplicate_count = conn.scalar(
+                sa.select([sa.func.count('*')]).select_from(label).where(label.c.name == st_name).where(label.c.project_id == proj['id'])
+            )
+            if duplicate_count > 0:
+                st_name = st_name + "2"
             lab = conn.execute(label.insert().values({
-                    'project_id': proj['id'], 'name': st_name, 'title': st_title, 'main_label_id': labset[0],
+                    'project_id': proj['id'], 'name': st_name, 'title': st_title, 'main_label_id': sessiontype_label[0],
                     'seq': index, 'description': u"", 'restricted': False, 'archived': False,
-                    'required': True, 'created_at': datetime.now(), 'updated_at': datetime.now()
+                    'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
                 }).returning(label.c.id, label.c.name)).first()
 
             proposals = conn.execute(
@@ -139,7 +149,7 @@ def upgrade():
                 )
             for prop in proposals:
                 conn.execute(proposal_label.insert().values({
-                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': datetime.now()
+                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
                     }))
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 570067e3b..a00bd1c4b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -9,7 +9,7 @@
 @app.route('/usertest')
 def user_test():
     from coaster.auth import current_auth
-    return current_auth.user.username if current_auth.user is not None else "anon"
+    return current_auth.user.username if current_auth.user is not None else "<anon>"
 
 
 TEST_DATA = {

From 0ffebb1e764c17e3bdf33ea79981746adf2e84aa Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 16:45:29 +0530
Subject: [PATCH 112/125] linter fixes

---
 .../versions/e2be4ab896d3_migrate_old_labels.py   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/migrations/versions/e2be4ab896d3_migrate_old_labels.py b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
index f531cfa38..8f94ea096 100644
--- a/migrations/versions/e2be4ab896d3_migrate_old_labels.py
+++ b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
@@ -10,7 +10,6 @@
 revision = 'e2be4ab896d3'
 down_revision = '0b25df40d307'
 
-from datetime import datetime
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.sql import table, column
@@ -22,12 +21,12 @@
     column('technical_level', sa.Unicode(40)),
     column('session_type', sa.Unicode(40)),
     column('section_id', sa.Integer()),
-    )
+)
 
 project = table('project',
     column('id', sa.Integer()),
     column('name', sa.Unicode(250))
-    )
+)
 
 section = table('section',
     column('id', sa.Integer()),
@@ -37,7 +36,7 @@
     column('description', sa.UnicodeText()),
     column('created_at', sa.DateTime()),
     column('updated_at', sa.DateTime())
-    )
+)
 
 label = table('label',
     column('id', sa.Integer()),
@@ -53,13 +52,13 @@
     column('archived', sa.Boolean()),
     column('created_at', sa.DateTime()),
     column('updated_at', sa.DateTime())
-    )
+)
 
 proposal_label = table('proposal_label',
     column('proposal_id', sa.Integer()),
     column('label_id', sa.Integer()),
     column('created_at', sa.DateTime())
-    )
+)
 
 
 def upgrade():
@@ -94,7 +93,7 @@ def upgrade():
                         proposal.select().where(proposal.c.section_id == sec['id']).where(proposal.c.project_id == sec['project_id'])
                     )
                 for prop in proposals:
-                    pl = conn.execute(proposal_label.insert().values({
+                    conn.execute(proposal_label.insert().values({
                         'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
                     }))
 
@@ -117,7 +116,7 @@ def upgrade():
                     proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.technical_level == tl_title)
                 )
             for prop in proposals:
-                pl = conn.execute(proposal_label.insert().values({
+                conn.execute(proposal_label.insert().values({
                     'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
                 }))
 

From c37f4b7a4a979cd75ad3c0a60e84bc28b21b4ca0 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 26 Apr 2019 17:05:29 +0530
Subject: [PATCH 113/125] Fix the label widget

---
 funnel/assets/js/proposal.js          | 13 +++++++------
 funnel/static/css/app.css             |  1 +
 funnel/static/sass/_layout.scss       |  1 +
 funnel/templates/proposal.html.jinja2 |  1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/funnel/assets/js/proposal.js b/funnel/assets/js/proposal.js
index 2f475e776..29a0d64aa 100644
--- a/funnel/assets/js/proposal.js
+++ b/funnel/assets/js/proposal.js
@@ -107,26 +107,27 @@ export const LabelsWidget = {
     // On load, if the radio has been selected, then check mark the listwidget label
     $('.listwidget input[type="radio"]').each(function() {
       if(this.checked) {
-        $(this).parents().find('.mui-form__label').addClass('checked');
+        $(this).siblings().find('.mui-form__label').addClass('checked');
       }
     });
 
     $('.listwidget .mui-form__label').click(function() {
       if($(this).hasClass('checked')) {
         $(this).removeClass('checked');
-        $(this).parents().find('input[type="radio"]').prop('checked', false);
+        $(this).siblings().find('input[type="radio"]').prop('checked', false);
         Widget.updateLabels('', $(this).text().trim(), false);
       } else {
         $(this).addClass('checked');
-        $(this).parents().find('input[type="radio"]').first().click();
+        $(this).siblings().find('input[type="radio"]').first().click();
       }
     });
 
         // Add check mark to listwidget label
     $('.listwidget input[type="radio"]').change(function() {
-      $(this).parents().find('.mui-form__label').addClass('checked');
-      let labelTxt = `${$(this).parents().find('.mui-form__label').text()}: ${$(this).parent().find('label').text()}`.trim();
-      let attr = $(this).parents().find('.mui-form__label').text().trim();
+      let label = $(this).parent().parent().prev('.mui-form__label');
+      label.addClass('checked');
+      let labelTxt = `${label.text()}: ${$(this).parent().find('label').text()}`.trim();
+      let attr = label.text().trim();
       Widget.updateLabels(labelTxt, attr, this.checked);
     });
 
diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index d405b2675..7448b326c 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -151,6 +151,7 @@ html.touch .collapsible__body--disable {
     position: -webkit-sticky;
     top: 70px;
     order: 1;
+    z-index: 5;
   }
 }
 @media screen and (max-width: 1024px) {
diff --git a/funnel/static/sass/_layout.scss b/funnel/static/sass/_layout.scss
index 03e594bf5..a2233f810 100644
--- a/funnel/static/sass/_layout.scss
+++ b/funnel/static/sass/_layout.scss
@@ -153,6 +153,7 @@ html.touch .collapsible__body--disable {
     position: -webkit-sticky;
     top: 70px;
     order: 1;
+    z-index: 5;
   }
 }
 
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 00847e6c4..4b62419b4 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -325,4 +325,5 @@
 </script>
 <script type="text/javascript" src="//apis.google.com/js/plusone.js"></script>
 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
+<script src="{{ 'parsley.js'|ext_asset_url }}" type="text/javascript"></script>
 {% endblock %}

From e8c8e78bd01b22afc273b7013ff2411de4d110ce Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 17:29:18 +0530
Subject: [PATCH 114/125] deleting options before deleting main label

---
 funnel/views/label.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index 8d8319d2c..29cd87d19 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -179,6 +179,9 @@ def delete(self):
         if self.obj.has_proposals:
             flash(_("Labels that have been assigned to proposals cannot be deleted"), category='error')
         else:
+            if self.obj.has_options:
+                for olabel in self.obj.options:
+                    db.session.delete(olabel)
             db.session.delete(self.obj)
             db.session.commit()
             flash(_("The label has been deleted"), category='success')

From e88416e29024fcc4e72a9f785e2429bc62be52c7 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 18:00:08 +0530
Subject: [PATCH 115/125] removed labelseqform

---
 tests/unit/forms/test_label_forms.py | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/tests/unit/forms/test_label_forms.py b/tests/unit/forms/test_label_forms.py
index 4e9ae773a..04af0460a 100644
--- a/tests/unit/forms/test_label_forms.py
+++ b/tests/unit/forms/test_label_forms.py
@@ -2,7 +2,7 @@
 
 from flask import current_app
 from werkzeug.datastructures import MultiDict
-from funnel.forms import LabelForm, LabelSeqForm, LabelOptionForm
+from funnel.forms import LabelForm
 
 
 class TestLabelForms(object):
@@ -25,17 +25,3 @@ def test_label_form_invalid(self, test_client):
             }), meta={'csrf': False})
             # title is required
             assert not form.validate()
-
-    def test_labelseq_form(self, test_client):
-        with current_app.test_request_context('/'):
-            form = LabelSeqForm(MultiDict({
-                'seq': u"1",
-            }), meta={'csrf': False})
-            assert form.validate()
-
-    def test_labelseq_form_invalid(self, test_client):
-        with current_app.test_request_context('/'):
-            form = LabelSeqForm(MultiDict({
-                'seq': u"",
-            }), meta={'csrf': False})
-            assert not form.validate()

From 953bc354c5e1cddea3ca225e8a157c16221645f9 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 18:01:57 +0530
Subject: [PATCH 116/125] fixed syntax error

---
 tests/unit/models/test_label.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index 93d2de31f..3f690781f 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -43,7 +43,7 @@ def test_proposal_assignment_radio(self, test_client, test_db, new_main_label, n
         label_a1.apply_to(new_proposal)
         assert label_a1 in new_proposal.labels
 
-        label_a2.apply_to(new_proposal
+        label_a2.apply_to(new_proposal)
         # because new_main_label is in radio mode,
         # label_a2 will replace label_a1
         assert label_a1 not in new_proposal.labels

From b4e7de10ef6938540d3cefa4c4d856be187e83b9 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 18:07:10 +0530
Subject: [PATCH 117/125] fixed proposal edit page label form

---
 funnel/forms/proposal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 91c125875..4b4424813 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -18,7 +18,7 @@ class ProposalLabelForm(forms.Form):
         pass
 
     for label in project.labels:
-        if label.is_main and not label.archived and not label.restricted:
+        if label.has_options and not label.archived and not label.restricted:
             setattr(ProposalLabelForm, label.name, forms.RadioField(
                 label.form_label_text,
                 description=label.description,

From 98954c7c8c90225280d1a20d340ca45d658f2c40 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Fri, 26 Apr 2019 18:11:08 +0530
Subject: [PATCH 118/125] Add title_for_name

---
 funnel/models/label.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index b8e63b4fb..8ab06e41e 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -84,6 +84,13 @@ class Label(BaseScopedNameMixin, db.Model):
         }
     }
 
+    @property
+    def title_for_name(self):
+        if self.main_label:
+            return u"%s/%s" % (self.main_label.title, self.title)
+        else:
+            return self.title
+
     @property
     def form_label_text(self):
         return self.icon_emoji + " " + self.title if self.icon_emoji is not None else self.title

From 344ac3b8a373061618a7797131b21b471d543b66 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 18:17:42 +0530
Subject: [PATCH 119/125] fixed archived getter

---
 funnel/models/label.py          | 8 +-------
 tests/unit/models/test_label.py | 2 ++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/funnel/models/label.py b/funnel/models/label.py
index b8e63b4fb..52c6affe3 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -113,7 +113,7 @@ def restricted(cls):
 
     @hybrid_property
     def archived(self):
-        return self._archived or self.main_label._archived if self.main_label else False
+        return self._archived or (self.main_label._archived if self.main_label else False)
 
     @archived.setter
     def archived(self, value):
@@ -148,12 +148,6 @@ def required(self, value):
             raise ValueError("Labels without options cannot be mandatory")
         self._required = value
 
-    @archived.expression
-    def archived(cls):
-        return case([
-            (cls.main_label_id != None, db.select([Label._required]).where(Label.id == cls.main_label_id).as_scalar())  # NOQA
-        ], else_=cls._required)
-
     @property
     def icon(self):
         """
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index 3f690781f..ad84b7a89 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -64,6 +64,8 @@ def test_label_icon(self, test_client, test_db, new_label):
 
     def test_label_archived(self, test_client, test_db, new_label):
         assert new_label.archived is False
+        assert new_label._archived is False
         new_label.archived = True
         test_db.session.commit()
+        assert new_label._archived is True
         assert new_label.archived is True

From e0482fce500eaee5a62cd831a8e9d364a2748a50 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Fri, 26 Apr 2019 18:26:52 +0530
Subject: [PATCH 120/125] Linter fixes

---
 funnel/views/label.py                         |  9 ++--
 funnel/views/proposal.py                      |  2 +-
 .../e2be4ab896d3_migrate_old_labels.py        | 52 +++++++++----------
 tests/conftest.py                             |  1 +
 tests/integration/views/test_project_views.py |  2 +-
 tests/unit/models/test_label.py               |  2 +-
 tests/unit/models/test_project.py             |  1 -
 7 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index 29cd87d19..a51c06fb4 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -4,7 +4,6 @@
 from werkzeug.datastructures import MultiDict
 from coaster.views import render_with, requires_permission, route, UrlForView, ModelView
 from baseframe import _, forms
-from baseframe.forms import render_delete_sqla
 
 from .. import app, funnelapp, lastuser
 from ..models import Label, db, Project, Profile
@@ -62,7 +61,7 @@ def new_label(self):
             for idx, title in enumerate(titlelist):
                 subform = LabelOptionForm(MultiDict({
                     'title': titlelist[idx], 'icon_emoji': emojilist[idx]
-                    }), meta={'csrf': False})  # parent form has valid CSRF token
+                }), meta={'csrf': False})  # parent form has valid CSRF token
 
                 if not subform.validate():
                     flash(_("Error with a sublabel: {}").format(subform.errors.pop()), category='error')
@@ -98,8 +97,8 @@ class LabelView(UrlForView, ModelView):
 
     def loader(self, profile, project, label):
         proj = Project.query.join(Profile).filter(
-                Profile.name == profile, Project.name == project
-            ).first_or_404()
+            Profile.name == profile, Project.name == project
+        ).first_or_404()
         label = self.model.query.filter_by(project=proj, name=label).first_or_404()
         g.profile = proj.profile
         return label
@@ -139,7 +138,7 @@ def edit(self):
                 else:
                     subform = LabelOptionForm(MultiDict({
                         'title': titlelist[idx], 'icon_emoji': emojilist[idx]
-                        }), meta={'csrf': False})  # parent form has valid CSRF token
+                    }), meta={'csrf': False})  # parent form has valid CSRF token
 
                     if not subform.validate():
                         flash(_("Error with a sublabel: {}").format(subform.errors.pop()), category='error')
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index c5b245344..6c1591272 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -13,7 +13,7 @@
 from .. import app, funnelapp, lastuser
 from ..models import db, Proposal, Comment
 from ..forms import (ProposalForm, CommentForm, DeleteCommentForm,
-    ProposalTransitionForm, ProposalMoveForm, ProposalLabelsForm,
+    ProposalTransitionForm, ProposalMoveForm,
     ProposalLabelsAdminForm)
 from .mixins import ProjectViewMixin, ProposalViewMixin
 from .decorators import legacy_redirect
diff --git a/migrations/versions/e2be4ab896d3_migrate_old_labels.py b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
index 8f94ea096..54c9def84 100644
--- a/migrations/versions/e2be4ab896d3_migrate_old_labels.py
+++ b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
@@ -67,16 +67,16 @@ def upgrade():
     projects = conn.execute(project.select())
     for proj in projects:
         sec_count = conn.scalar(
-                sa.select([sa.func.count('*')]).select_from(section).where(section.c.project_id == proj['id'])
-            )
+            sa.select([sa.func.count('*')]).select_from(section).where(section.c.project_id == proj['id'])
+        )
         if sec_count > 0:
             # the project has some sections
             # create section labelset for the project
             sections_label = conn.execute(label.insert().values({
-                    'project_id': proj['id'], 'name': u"section", 'title': u"Section",
-                    'seq': 1, 'description': u"", 'restricted': False, 'archived': False,
-                    'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
-                }).returning(label.c.id)).first()
+                'project_id': proj['id'], 'name': u"section", 'title': u"Section",
+                'seq': 1, 'description': u"", 'restricted': False, 'archived': False,
+                'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
+            }).returning(label.c.id)).first()
 
             sections = conn.execute(section.select().where(section.c.project_id == proj['id']))
             for index, sec in enumerate(sections, start=1):
@@ -90,8 +90,8 @@ def upgrade():
                 # FIXME: This will miss proposals in a project linked to sections in another project
                 # -- an error condition resulting from proposals that have been moved around
                 proposals = conn.execute(
-                        proposal.select().where(proposal.c.section_id == sec['id']).where(proposal.c.project_id == sec['project_id'])
-                    )
+                    proposal.select().where(proposal.c.section_id == sec['id']).where(proposal.c.project_id == sec['project_id'])
+                )
                 for prop in proposals:
                     conn.execute(proposal_label.insert().values({
                         'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
@@ -107,14 +107,14 @@ def upgrade():
         for index, tl in enumerate(tl_list, start=1):
             tl_name, tl_title = tl
             lab = conn.execute(label.insert().values({
-                    'project_id': proj['id'], 'name': tl_name, 'title': tl_title, 'main_label_id': techlevel_label[0],
-                    'seq': index, 'description': u"", 'restricted': False, 'archived': False,
-                    'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
-                }).returning(label.c.id, label.c.name)).first()
+                'project_id': proj['id'], 'name': tl_name, 'title': tl_title, 'main_label_id': techlevel_label[0],
+                'seq': index, 'description': u"", 'restricted': False, 'archived': False,
+                'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
+            }).returning(label.c.id, label.c.name)).first()
 
             proposals = conn.execute(
-                    proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.technical_level == tl_title)
-                )
+                proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.technical_level == tl_title)
+            )
             for prop in proposals:
                 conn.execute(proposal_label.insert().values({
                     'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
@@ -122,10 +122,10 @@ def upgrade():
 
         # session type
         sessiontype_label = conn.execute(label.insert().values({
-                'project_id': proj['id'], 'name': u"session-type", 'title': u"Session type",
-                'seq': 3, 'description': u"", 'restricted': False, 'archived': False,
-                'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
-            }).returning(label.c.id)).first()
+            'project_id': proj['id'], 'name': u"session-type", 'title': u"Session type",
+            'seq': 3, 'description': u"", 'restricted': False, 'archived': False,
+            'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
+        }).returning(label.c.id)).first()
 
         st_list = [(u'lecture', u"Lecture"), (u'demo', u"Demo"), (u'tutorial', u"Tutorial"),
             (u'workshop', u"Workshop"), (u'discussion', u"Discussion"), (u'panel', u"Panel")]
@@ -138,18 +138,18 @@ def upgrade():
             if duplicate_count > 0:
                 st_name = st_name + "2"
             lab = conn.execute(label.insert().values({
-                    'project_id': proj['id'], 'name': st_name, 'title': st_title, 'main_label_id': sessiontype_label[0],
-                    'seq': index, 'description': u"", 'restricted': False, 'archived': False,
-                    'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
-                }).returning(label.c.id, label.c.name)).first()
+                'project_id': proj['id'], 'name': st_name, 'title': st_title, 'main_label_id': sessiontype_label[0],
+                'seq': index, 'description': u"", 'restricted': False, 'archived': False,
+                'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
+            }).returning(label.c.id, label.c.name)).first()
 
             proposals = conn.execute(
-                    proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.session_type == st_title)
-                )
+                proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.session_type == st_title)
+            )
             for prop in proposals:
                 conn.execute(proposal_label.insert().values({
-                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
-                    }))
+                    'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
+                }))
 
 
 def downgrade():
diff --git a/tests/conftest.py b/tests/conftest.py
index a00bd1c4b..f9b10e4d5 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
 import pytest
 import uuid
 from funnel import app
diff --git a/tests/integration/views/test_project_views.py b/tests/integration/views/test_project_views.py
index d1e3aa875..a0e3c2d3d 100644
--- a/tests/integration/views/test_project_views.py
+++ b/tests/integration/views/test_project_views.py
@@ -2,7 +2,7 @@
 
 from werkzeug.datastructures import MultiDict
 from funnel.models import Label
-from funnel.forms import LabelForm, LabelOptionForm
+from funnel.forms import LabelForm
 
 
 class TestProjectViews(object):
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
index ad84b7a89..951f533ea 100644
--- a/tests/unit/models/test_label.py
+++ b/tests/unit/models/test_label.py
@@ -50,7 +50,7 @@ def test_proposal_assignment_radio(self, test_client, test_db, new_main_label, n
         assert label_a2 in new_proposal.labels
 
     def test_label_flags(self, new_main_label, new_label):
-        restricted_labels = Label.query.filter(Label.restricted == True).all()
+        restricted_labels = Label.query.filter(Label.restricted == True).all()  # NOQA
         assert new_main_label in restricted_labels
         assert new_label not in restricted_labels
 
diff --git a/tests/unit/models/test_project.py b/tests/unit/models/test_project.py
index 00d2a0167..37367a7c9 100644
--- a/tests/unit/models/test_project.py
+++ b/tests/unit/models/test_project.py
@@ -10,7 +10,6 @@ def test_project_state_conditional(self, test_client, test_db):
         upcoming_projects = Project.query.filter(Project.state.UPCOMING).all()
         assert len(upcoming_projects) >= 0
 
-
     def test_project_cfp_state_conditional(self, test_client, test_db):
         private_draft_cfp_projects = Project.query.filter(Project.cfp_state.PRIVATE_DRAFT).all()
         assert len(private_draft_cfp_projects) >= 0

From e5fc767f6ab4f12375678c10847c3febf47847ea Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 20:22:05 +0530
Subject: [PATCH 121/125] added test for label create, reorder and delete

---
 tests/conftest.py                           |   9 +-
 tests/integration/views/test_label_views.py | 119 ++++++++++++++++++++
 2 files changed, 121 insertions(+), 7 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index a00bd1c4b..3e5357ede 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -114,7 +114,7 @@ def new_project(test_db, new_profile, new_user, new_team):
     return project
 
 
-@pytest.fixture(scope='session')
+@pytest.fixture(scope='class')
 def new_main_label(test_db, new_project):
     main_label_a = Label(
         title=u"Parent Label A", project=new_project,
@@ -138,7 +138,7 @@ def new_main_label(test_db, new_project):
     return main_label_a
 
 
-@pytest.fixture(scope='session')
+@pytest.fixture(scope='class')
 def new_main_label_unrestricted(test_db, new_project):
     main_label_b = Label(
         title=u"Parent Label B", project=new_project,
@@ -161,11 +161,6 @@ def new_main_label_unrestricted(test_db, new_project):
 
     return main_label_b
 
-# Scope: function
-# These fixtures are run before every test function,
-# so that changes made to the objects they return in one test function
-# doesn't affect another test function.
-
 
 @pytest.fixture(scope='class')
 def new_label(test_db, new_project):
diff --git a/tests/integration/views/test_label_views.py b/tests/integration/views/test_label_views.py
index babad1d10..497ead56b 100644
--- a/tests/integration/views/test_label_views.py
+++ b/tests/integration/views/test_label_views.py
@@ -1,9 +1,69 @@
 # -*- coding: utf-8 -*-
 
+from werkzeug.datastructures import MultiDict
 from funnel.models import Label
 
 
 class TestLabelViews(object):
+    def test_manage_labels_view(self, test_client, test_db, new_project, new_user, new_label, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp = c.get(new_project.url_for('labels'))
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert new_label.title in resp.data.decode('utf-8')
+            assert new_main_label.title in resp.data.decode('utf-8')
+
+    def test_labels_order_view(self, test_client, test_db, new_project, new_user, new_label, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            assert new_label.seq == 1
+            assert new_main_label.seq == 2
+
+            # we'll send the label names in reverse order and that should
+            # reorder them in the project
+            resp = c.post(new_project.url_for('labels'), data=MultiDict({
+                    'name': [new_main_label.name, new_label.name]
+                }), follow_redirects=True)
+
+            # make sure the page loaded properly
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert new_label.title in resp.data.decode('utf-8')
+            assert new_main_label.title in resp.data.decode('utf-8')
+
+            # make sure the reoder took place
+            assert new_label.seq == 2
+            assert new_main_label.seq == 1
+
+    def test_new_label_view(self, test_client, test_db, new_project, new_user):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp = c.post(new_project.url_for('new_label'), data=MultiDict({
+                'title': ["New Main Label", "New Option A", "New Option B"],
+                'icon_emoji': [u"💯", u"", u""],
+            }), follow_redirects=True)
+
+            mlabel = Label.query.filter_by(project=new_project, title=u"New Main Label").first()
+            assert mlabel is not None
+            assert mlabel.icon == u"💯"
+            assert mlabel.has_options
+            assert mlabel.is_main_label
+            assert mlabel.main_label is None
+            assert len(mlabel.options) == 2
+
+            assert mlabel.options[0].title == "New Option A"
+            assert mlabel.options[0].seq == 1
+            assert mlabel.options[1].title == "New Option B"
+            assert mlabel.options[1].seq == 2
+
+            # make sure the page loaded properly
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert mlabel.title in resp.data.decode('utf-8')
+
+
+class TestLabelArchiveView(object):
     def test_label_archive(self, test_client, test_db, new_user, new_label):
         with test_client.session_transaction() as session:
             session['lastuser_userid'] = new_user.userid
@@ -13,3 +73,62 @@ def test_label_archive(self, test_client, test_db, new_user, new_label):
             assert u"Manage labels" in resp.data.decode('utf-8')
             assert u"The label has been archived" in resp.data.decode('utf-8')
             assert label.archived is True
+
+
+class TestLabelDeleteView(object):
+    """
+    Separate class because the ``new_label`` fixture has a class scope.
+    If we delete it in any other test classes, it'll mess with other
+    tests in those classes.
+    """
+    def test_main_label_delete(self, test_client, test_db, new_user, new_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp = c.post(new_label.url_for('delete'), follow_redirects=True)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"The label has been deleted" in resp.data.decode('utf-8')
+            label = Label.query.get(new_label.id)
+            assert label is None
+
+    def test_option_label_delete(self, test_client, test_db, new_user, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            label_a1 = new_main_label.options[0]
+            label_a2 = new_main_label.options[1]
+
+            assert label_a1.title == u"Label A1"
+            assert label_a1.seq == 1
+            assert label_a2.title == u"Label A2"
+            assert label_a2.seq == 2
+
+            # let's delete A1
+            resp = c.post(label_a1.url_for('delete'), follow_redirects=True)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"The label has been deleted" in resp.data.decode('utf-8')
+            label = Label.query.get(label_a1.id)
+            assert label is None
+
+            # as A1 is deleted, A2's sequence should change to 1
+            assert label_a2.seq == 1
+
+
+class TestOptionedLabelDeleteView(object):
+    def test_optioned_label_delete(self, test_client, test_db, new_user, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            label_a1 = new_main_label.options[0]
+            label_a2 = new_main_label.options[1]
+
+            # let's delete the main optioned label
+            resp = c.post(new_main_label.url_for('delete'), follow_redirects=True)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"The label has been deleted" in resp.data.decode('utf-8')
+            mlabel = Label.query.get(new_main_label.id)
+            assert mlabel is None
+
+            # so the option labels should have been deleted as well
+            for olabel in [label_a1, label_a2]:
+                assert Label.query.get(olabel.id) is None

From 30bb4be5d86cbfabfc566a2fe085206f37cbf111 Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 20:22:27 +0530
Subject: [PATCH 122/125] reordering after label delete

---
 funnel/views/label.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index 29cd87d19..3ae1c774a 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -184,6 +184,10 @@ def delete(self):
                     db.session.delete(olabel)
             db.session.delete(self.obj)
             db.session.commit()
+
+            if self.obj.main_label:
+                self.obj.main_label.options.reorder()
+                db.session.commit()
             flash(_("The label has been deleted"), category='success')
         return redirect(self.obj.project.url_for('labels'), code=303)
 

From 4975b6f5d528a7cc781ddcb3d02fecc5a00f713e Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Fri, 26 Apr 2019 21:49:47 +0530
Subject: [PATCH 123/125] added test for editing labels

---
 funnel/views/label.py                       |  1 +
 tests/integration/views/test_label_views.py | 45 +++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/funnel/views/label.py b/funnel/views/label.py
index 553ee0cb3..58b01d12d 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -154,6 +154,7 @@ def edit(self):
 
             form.populate_obj(self.obj)
             db.session.commit()
+            flash(_("Label has been edited"), category='success')
 
             return redirect(self.obj.project.url_for('labels'), code=303)
         return dict(title="Edit label", form=form, subforms=subforms, emptysubform=emptysubform, project=self.obj.project)
diff --git a/tests/integration/views/test_label_views.py b/tests/integration/views/test_label_views.py
index 497ead56b..f17016971 100644
--- a/tests/integration/views/test_label_views.py
+++ b/tests/integration/views/test_label_views.py
@@ -62,6 +62,51 @@ def test_new_label_view(self, test_client, test_db, new_project, new_user):
             assert u"Manage labels" in resp.data.decode('utf-8')
             assert mlabel.title in resp.data.decode('utf-8')
 
+    def test_edit_option_label_view(self, test_client, test_db, new_project, new_user, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            opt_label = new_main_label.options[0]
+            resp = c.post(opt_label.url_for('edit'), follow_redirects=True)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"Only main labels can be edited" in resp.data.decode('utf-8')
+
+
+    def test_edit_main_label_view(self, test_client, test_db, new_project, new_user, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            assert new_main_label.title == u"Parent Label A"
+            assert new_main_label.name == u"parent-label-a"
+            assert new_main_label.icon_emoji is None
+
+            label_a1 = new_main_label.options[0]
+            label_a2 = new_main_label.options[1]
+
+            assert label_a1.title == u"Label A1"
+            assert label_a1.name == u"label-a1"
+            assert label_a2.title == u"Label A2"
+            assert label_a2.name == u"label-a2"
+
+            resp = c.post(new_main_label.url_for('edit'), data=MultiDict({
+                'name': ["parent-label-a", "label-a1", "label-a2"],
+                'title': ["Parent Label A Edited", "Label A1 Edited", "Label A2 Edited"],
+                'icon_emoji': [u"🔟", u"👍", u"❌"]
+            }), follow_redirects=True)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"Label has been edited" in resp.data.decode('utf-8')
+
+            assert new_main_label.title == u"Parent Label A Edited"
+            assert new_main_label.name == u"parent-label-a"
+            assert new_main_label.icon_emoji == u"🔟"
+
+            assert label_a1.title == u"Label A1 Edited"
+            assert label_a1.name == u"label-a1"
+            assert label_a1.icon == u"👍"
+            assert label_a2.title == u"Label A2 Edited"
+            assert label_a2.name == u"label-a2"
+            assert label_a2.icon == u"❌"
+
 
 class TestLabelArchiveView(object):
     def test_label_archive(self, test_client, test_db, new_user, new_label):

From b71bc4e20f946da492228376ff57c9a56c660f35 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Fri, 26 Apr 2019 22:05:21 +0530
Subject: [PATCH 124/125] Session type hasn't been used for a while

---
 migrations/versions/e2be4ab896d3_migrate_old_labels.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migrations/versions/e2be4ab896d3_migrate_old_labels.py b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
index 54c9def84..7f84c7c40 100644
--- a/migrations/versions/e2be4ab896d3_migrate_old_labels.py
+++ b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
@@ -124,7 +124,7 @@ def upgrade():
         sessiontype_label = conn.execute(label.insert().values({
             'project_id': proj['id'], 'name': u"session-type", 'title': u"Session type",
             'seq': 3, 'description': u"", 'restricted': False, 'archived': False,
-            'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
+            'required': False, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
         }).returning(label.c.id)).first()
 
         st_list = [(u'lecture', u"Lecture"), (u'demo', u"Demo"), (u'tutorial', u"Tutorial"),

From 8f9e45a054ba38ef74ea20477c5baada566976b7 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Fri, 26 Apr 2019 22:08:52 +0530
Subject: [PATCH 125/125] Rename sublabel to option

---
 funnel/templates/labels.html.jinja2      |  4 ++--
 funnel/templates/labels_form.html.jinja2 |  2 +-
 funnel/views/label.py                    | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
index a2c2e7e0e..1cd06585f 100644
--- a/funnel/templates/labels.html.jinja2
+++ b/funnel/templates/labels.html.jinja2
@@ -26,8 +26,8 @@
           {% if label.has_options %}
             <h3 class="mui--text-title mui--text-bold label-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
             <div class="sublabel-wrapper">
-              {%- for sublabel in label.options %}
-                <span class="mui--text-subhead mui--text-light label-box__subheading">{% if sublabel.icon_emoji %}{{ sublabel.icon_emoji }} {% endif %}{{ sublabel.title }}</span>
+              {%- for option in label.options %}
+                <span class="mui--text-subhead mui--text-light label-box__subheading">{% if option.icon_emoji %}{{ option.icon_emoji }} {% endif %}{{ option.title }}</span>
               {% else %}
                 <span class="mui--text-subhead mui--text-light"><em>{% trans %}(No labels){% endtrans %}</em></span>
               {%- endfor %}
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
index a80d1392e..f52c2f080 100644
--- a/funnel/templates/labels_form.html.jinja2
+++ b/funnel/templates/labels_form.html.jinja2
@@ -54,7 +54,7 @@
         {% endfor %}
       {% endif %}
     </div>
-    <div><button class="mui-btn mui-btn--raised mui-btn--accent" id="add-sublabel-form"><i class="material-icons mui--align-middle mui--text-subhead">add</i> Add Sublabel</button></div>
+    <div><button class="mui-btn mui-btn--raised mui-btn--accent" id="add-sublabel-form"><i class="material-icons mui--align-middle mui--text-subhead">add</i> Add option</button></div>
     {%- if subforms|length > 0 %}
       {{ renderfield(form.required) }}
     {%- else -%}
diff --git a/funnel/views/label.py b/funnel/views/label.py
index 58b01d12d..b0265eb48 100644
--- a/funnel/views/label.py
+++ b/funnel/views/label.py
@@ -41,9 +41,9 @@ def new_label(self):
         emptysubform = LabelOptionForm(MultiDict({}))
         if form.validate_on_submit():
             # This form can send one or multiple values for title and icon_emoji.
-            # If the label doesn't have any sublabel, one value is sent for each list,
+            # If the label doesn't have any options, one value is sent for each list,
             # and those values are also available at `form.data`.
-            # But in case there are sublabels, the sublabel values are in the list
+            # But in case there are options, the option values are in the list
             # in the order they appeared on the create form.
             titlelist = request.values.getlist('title')
             emojilist = request.values.getlist('icon_emoji')
@@ -64,7 +64,7 @@ def new_label(self):
                 }), meta={'csrf': False})  # parent form has valid CSRF token
 
                 if not subform.validate():
-                    flash(_("Error with a sublabel: {}").format(subform.errors.pop()), category='error')
+                    flash(_("Error with a label option: {}").format(subform.errors.pop()), category='error')
                     return dict(title="Add label", form=form, project=self.obj)
                 else:
                     subl = Label(project=self.obj)
@@ -130,7 +130,7 @@ def edit(self):
 
             for idx, title in enumerate(titlelist):
                 if namelist[idx]:
-                    # existing sublabel
+                    # existing option
                     subl = Label.query.filter_by(project=self.obj.project, name=namelist[idx]).first()
                     subl.title = titlelist[idx]
                     subl.icon_emoji = emojilist[idx]
@@ -141,7 +141,7 @@ def edit(self):
                     }), meta={'csrf': False})  # parent form has valid CSRF token
 
                     if not subform.validate():
-                        flash(_("Error with a sublabel: {}").format(subform.errors.pop()), category='error')
+                        flash(_("Error with a label option: {}").format(subform.errors.pop()), category='error')
                         return dict(title="Edit label", form=form, project=self.obj.project)
                     else:
                         subl = Label(project=self.obj.project)