Merge lp:~mhall119/ubuntu-community-accomplishments/loco-portal-events-accomplishments into lp:ubuntu-community-accomplishments

[Michael Hall]

Make global jam and ubuntu hour checks more flexible, add tests

Make global jam and ubuntu hour checks more flexible, add tests

[lp:~mhall119/ubuntu-community-accomplishments/loco-portal-events-accomplishments]

147. By Michael Hall on 2012-06-01

Add sub-category for LoCo Teams:Events

148. By Michael Hall on 2012-06-01

Add LoCo Teams:Events to the CATEGORIES file

149. By Michael Hall on 2012-06-01

Merge from trunk

=== modified file 'CATEGORIES'
--- CATEGORIES	2012-06-01 19:58:27 +0000
+++ CATEGORIES	2012-06-01 20:11:22 +0000
@@ -15,5 +15,6 @@
     Your Profile
     Code Hosting
 LoCo Teams
+    Events
 QA
 Forums

=== modified file 'accomplishments/ubuntu-community/en/advocacy/attend-global-jam.accomplishment'
--- accomplishments/ubuntu-community/en/advocacy/attend-global-jam.accomplishment	2012-05-31 23:11:49 +0000
+++ accomplishments/ubuntu-community/en/advocacy/attend-global-jam.accomplishment	2012-06-01 20:11:22 +0000
@@ -2,7 +2,7 @@
 title=Attend Ubuntu Global Jam Event
 description=You attended a Global Jam with your Local Community
 collection=ubuntu-community
-category=LoCo Teams
+category=LoCo Teams:Events
 needs-signing=true
 icon=loco.png
 depends=ubuntu-community/attend-loco-event

=== modified file 'accomplishments/ubuntu-community/en/advocacy/attend-loco-event.accomplishment'
--- accomplishments/ubuntu-community/en/advocacy/attend-loco-event.accomplishment	2012-05-24 21:28:36 +0000
+++ accomplishments/ubuntu-community/en/advocacy/attend-loco-event.accomplishment	2012-06-01 20:11:22 +0000
@@ -2,7 +2,7 @@
 title=Attend LoCo Team Event
 description=You attended a Local Community Team event
 collection=ubuntu-community
-category=LoCo Teams
+category=LoCo Teams:Events
 needs-signing=true
 icon=loco.png
 depends=ubuntu-community/registered-on-launchpad

=== modified file 'accomplishments/ubuntu-community/en/advocacy/attend-other-team-event.accomplishment'
--- accomplishments/ubuntu-community/en/advocacy/attend-other-team-event.accomplishment	2012-06-01 06:06:57 +0000
+++ accomplishments/ubuntu-community/en/advocacy/attend-other-team-event.accomplishment	2012-06-01 20:11:22 +0000
@@ -2,7 +2,7 @@
 title=Attend Event with another Local Community
 description=You attended an event with a Local Community other than your own
 collection=ubuntu-community
-category=LoCo Teams
+category=LoCo Teams:Events
 needs-signing=true
 icon=loco.png
 depends=ubuntu-community/member-loco-team ubuntu-community/attend-loco-event

=== modified file 'accomplishments/ubuntu-community/en/advocacy/attend-ubuntu-hour.accomplishment'
--- accomplishments/ubuntu-community/en/advocacy/attend-ubuntu-hour.accomplishment	2012-05-31 23:11:49 +0000
+++ accomplishments/ubuntu-community/en/advocacy/attend-ubuntu-hour.accomplishment	2012-06-01 20:11:22 +0000
@@ -2,7 +2,7 @@
 title=Attend Ubuntu Hour Event
 description=You attended an Ubuntu Hour with your Local Community
 collection=ubuntu-community
-category=LoCo Teams
+category=LoCo Teams:Events
 needs-signing=true
 icon=loco.png
 depends=ubuntu-community/attend-loco-event

=== modified file 'accomplishments/ubuntu-community/en/advocacy/organize-loco-event.accomplishment'
--- accomplishments/ubuntu-community/en/advocacy/organize-loco-event.accomplishment	2012-05-31 23:42:29 +0000
+++ accomplishments/ubuntu-community/en/advocacy/organize-loco-event.accomplishment	2012-06-01 20:11:22 +0000
@@ -2,7 +2,7 @@
 title=Organized a LoCo Team Event
 description=You organized a Local Community Team event
 collection=ubuntu-community
-category=LoCo Teams
+category=LoCo Teams:Events
 needs-signing=true
 icon=loco.png
 depends=ubuntu-community/registered-on-launchpad

=== modified file 'scripts/ubuntu-community/advocacy/attend-global-jam.py'
--- scripts/ubuntu-community/advocacy/attend-global-jam.py	2012-06-01 06:06:57 +0000
+++ scripts/ubuntu-community/advocacy/attend-global-jam.py	2012-06-01 20:11:22 +0000
@@ -11,7 +11,7 @@
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'lib')))
 from loco_team_portal import LocoTeamPortal
 
-GLOBAL_JAM_NAME = 'Ubuntu Global Jam'
+GLOBAL_JAM_NAME = 'Global Jam'
 
 try:
 
@@ -29,7 +29,7 @@
         sys.exit(1)
 
     ltp = LocoTeamPortal()
-    attending = ltp.getCollection('attendees', attendee_profile__user__username=me.name, promise="sure", team_event__date_begin__lt=datetime.datetime.now(), team_event__global_event__name=GLOBAL_JAM_NAME)
+    attending = ltp.getCollection('attendees', attendee_profile__user__username=me.name, promise="sure", team_event__date_begin__lt=datetime.datetime.now(), team_event__global_event__name__contains=GLOBAL_JAM_NAME)
     if len(attending) > 0:
         sys.exit(0)
     else:

=== modified file 'scripts/ubuntu-community/advocacy/attend-ubuntu-hour.py'
--- scripts/ubuntu-community/advocacy/attend-ubuntu-hour.py	2012-06-01 06:06:57 +0000
+++ scripts/ubuntu-community/advocacy/attend-ubuntu-hour.py	2012-06-01 20:11:22 +0000
@@ -29,7 +29,7 @@
         sys.exit(1)
 
     ltp = LocoTeamPortal()
-    attending = ltp.getCollection('attendees', attendee_profile__user__username=me.name, promise="sure", team_event__date_begin__lt=datetime.datetime.now(), team_event__global_event__name=UBUNTU_HOUR_NAME)
+    attending = ltp.getCollection('attendees', attendee_profile__user__username=me.name, promise="sure", team_event__date_begin__lt=datetime.datetime.now(), team_event__global_event__name__contains=UBUNTU_HOUR_NAME)
     if len(attending) > 0:
         sys.exit(0)
     else: