Browse Source

invitations for BarCamp and GeneralAssembly 2015

feature/1967/afm_pdflatex
Christoph Scheid 7 years ago
parent
commit
6d6f899f7b
6 changed files with 58 additions and 15 deletions
  1. +28
    -0
      alembic/versions/2a6d1059c519_new_db_fields_for_GV_and_BC_2015.py
  2. +16
    -8
      c3smembership/invite_members.py
  3. +2
    -0
      c3smembership/models.py
  4. +7
    -7
      c3smembership/templates/dashboard.pt
  5. +3
    -0
      development.ini
  6. +2
    -0
      production.ini

+ 28
- 0
alembic/versions/2a6d1059c519_new_db_fields_for_GV_and_BC_2015.py View File

@ -0,0 +1,28 @@
"""new DB fields for GV and BC 2015
Revision ID: 2a6d1059c519
Revises: 1a6cbb61c557
Create Date: 2015-04-23 22:40:45.466937
"""
# revision identifiers, used by Alembic.
revision = '2a6d1059c519'
down_revision = '1a6cbb61c557'
from alembic import op
import sqlalchemy as sa
def upgrade():
### commands auto generated by Alembic - please adjust! ###
op.add_column('members', sa.Column('email_invite_date_bcgv15', sa.DateTime(), nullable=True))
op.add_column('members', sa.Column('email_invite_flag_bcgv15', sa.Boolean(), nullable=True))
### end Alembic commands ###
def downgrade():
### commands auto generated by Alembic - please adjust! ###
op.drop_column('members', 'email_invite_flag_bcgv15')
op.drop_column('members', 'email_invite_date_bcgv15')
### end Alembic commands ###

+ 16
- 8
c3smembership/invite_members.py View File

@ -340,7 +340,7 @@ Auf der verlinkten Seite kannst Du separat die Teilnahme für die
Generalversammlung und das Barcamp bestätigen. Auch Essen und
(natürlich) ein T-Shirt mit neuem Motiv für die tollen C3S-Tage am Rhein
kannst Du Dir holen - die T-Shirt-Preise haben wir für die
Veranstaltungen übrigens heruntergesetzt.
Veranstaltungen übrigens heruntergesetzt.
Wenn Du sicher sein möchtest, von Deiner Teilnahme an Barcamp oder
Generalversammlung ein T-Shirt mit nach Hause zu nehmen, solltest Du es
@ -649,7 +649,7 @@ On the linked page you can confirm your participation in the general
assembly and the barcamp separately. You can also book food, and (of
course) a t-shirt with a new image for the great days with the C3S on
the banks of the river Rhine -- we have reduced our t-shirt prices for
these events.
these events.
If you want to be sure to take a t-shirt home from either the BarCamp or
the general assembly, save the date for pre-order: 11th August, 2014.
@ -720,13 +720,21 @@ Links:
'Reply-To': 'yes@c3s.cc',
}
)
#print(message.subject)
#print(message.body)
mailer = get_mailer(request)
mailer.send(message)
if 'true' in request.registry.settings['testing.mail_to_console']:
# ^^ yes, a little ugly, but works; it's a string
#print "printing mail"
#print(message.subject)
#print(message.body)
print(message.body.encode('utf-8'))
else:
#print "sending mail"
mailer = get_mailer(request)
mailer.send(message)
#_m._token = _looong_token
_m.email_invite_flag_bcgv14 = True
_m.email_invite_date_bcgv14 = datetime.now()
_m.email_invite_flag_bcgv15 = True
_m.email_invite_date_bcgv15 = datetime.now()
return HTTPFound(request.route_url('dashboard',
number=request.cookies['on_page'],
order=request.cookies['order'],


+ 2
- 0
c3smembership/models.py View File

@ -314,6 +314,8 @@ class C3sMember(Base):
# invitations
email_invite_flag_bcgv14 = Column(Boolean, default=False)
email_invite_date_bcgv14 = Column(DateTime(), default=datetime(1970, 1, 1))
email_invite_flag_bcgv15 = Column(Boolean, default=False)
email_invite_date_bcgv15 = Column(DateTime(), default=datetime(1970, 1, 1))
# legal entities
is_legalentity = Column(Boolean, default=False)
court_of_law = Column(Unicode(255))


+ 7
- 7
c3smembership/templates/dashboard.pt View File

@ -105,11 +105,11 @@
title="sort by id: descending"
class="glyphicon glyphicon-chevron-down"></a>
</th>
<!-- Deactivated for task1291. Left inside for next GV.
<!-- Reactivated for for next GV. -->
<th>
BC/GV
</th>
-->
<!-- -->
<th>
mtype<br />
status
@ -154,18 +154,18 @@
<div tal:condition="member.is_duplicate">
<a href="${request.route_url('detail', memberid=member.is_duplicate_of)}">dup:${member.is_duplicate_of}</div>
</td>
<!-- Deactivated for task1291. Left inside for next GV.
<!-- Reactivated for next GV. -->
<td>
<a tal:condition="not member.email_invite_flag_bcgv14"
<a tal:condition="not member.email_invite_flag_bcgv15"
href="${request.route_url('invite_member', m_id=member.id)}"
title="BC/GV invitation not sent yet"
class="btn btn-danger"></a>
<a tal:condition="member.email_invite_flag_bcgv14"
<a tal:condition="member.email_invite_flag_bcgv15"
href="${request.route_url('invite_member', m_id=member.id)}"
title="gesendet ${member.email_invite_date_bcgv14.strftime('am %d.%m.%Y um %H:%M')}"
title="gesendet ${member.email_invite_date_bcgv15.strftime('am %d.%m.%Y um %H:%M')}"
class="btn btn-success"></a>
</td>
-->
<!-- -->
<td>
<a tal:condition="(member.membership_type == 'startnext') or
(member.membership_type == 'unknown') or


+ 3
- 0
development.ini View File

@ -27,6 +27,9 @@ startnext_importfile = /the/path/to/c3sMembership/import/test_startnext.csv
founders_importfile = /path/to/c3sMembership/import/test_founders.csv
api_auth_token = 1234567890ABCDEFGHIJKL
ticketing.url = http://0.0.0.0:6544
testing.mail_to_console = true
[server:main]
use = egg:waitress#main
#Paste#http


+ 2
- 0
production.ini View File

@ -26,6 +26,8 @@ available_languages = da de en es fr
startnext_importfile = /the/path/to/c3sMembership/import/test_startnext.csv
founders_importfile = /the/path/to/c3sMembership/import/test_founders.csv
testing.mail_to_console = false
[server:main]
use = egg:waitress#main
host = 0.0.0.0


Loading…
Cancel
Save