Check if user profile was filled for pontuation

Hugo Melo
1 parent 74c15a6a
Showing 2 changed files with 16 additions and 7 deletions Show diff stats
lib/ext/person.rb
lib/merit/point_rules.rb
@@ -5,12 +5,21 @@ class Person
   # TODO why this relationship doesn't exists in core?
   has_many :comments, :foreign_key => 'author_id'
  
+  after_save { |obj| obj.new_merit_action(:update, {}) }
+
   def profile_completion_score_condition
-    self.points(category: 'profile_completion') == 0 and self.is_profile_complete?
+    categories = []
+    GamificationPlugin::PointsCategorization.for_type('profile_completion').each {|i| categories << i.id.to_s}
+    self.points(category: categories) == 0 and self.is_profile_complete?
   end
+
   def is_profile_complete?
-    # FIXME: FIND OUT A WAY TO CHECK EVERY REGISTRY FIELD
-    false
+    !(self.name.blank? or
+      (self.data[:identidade_genero].blank? and self.data[:transgenero].blank?) or
+      self.data[:etnia].blank? or
+      self.data[:orientacao_sexual].blank? or
+      self.data[:state].blank? or
+      self.data[:city].blank?)
   end
  
   def points_by_type type
@@ -96,14 +96,14 @@ module Merit
         profile_action: false
       },
       profile_completion: {
-        action: ['account#create', 'account#update'],
-        undo_action: 'account#destroy',
-        to: lambda {|user| user.person},
+        action: ['profile#create', 'profile#update'],
+        undo_action: 'profile#destroy',
+        to: :itself,
         value: 1,
         description: _('Profile Completion'),
         default_weight: 100,
         model_name: "User",
-        condition: lambda {|user| user.person.profile_completion_score_condition },
+        condition: lambda {|person| person.person? and person.profile_completion_score_condition },
         profile_action: false
       },
       follower: {
...	...	@@ -5,12 +5,21 @@ class Person
5	5	# TODO why this relationship doesn't exists in core?
6	6	has_many :comments, :foreign_key => 'author_id'
7	7
	8	+ after_save { \|obj\| obj.new_merit_action(:update, {}) }
	9	+
8	10	def profile_completion_score_condition
9		- self.points(category: 'profile_completion') == 0 and self.is_profile_complete?
	11	+ categories = []
	12	+ GamificationPlugin::PointsCategorization.for_type('profile_completion').each {\|i\| categories << i.id.to_s}
	13	+ self.points(category: categories) == 0 and self.is_profile_complete?
10	14	end
	15	+
11	16	def is_profile_complete?
12		- # FIXME: FIND OUT A WAY TO CHECK EVERY REGISTRY FIELD
13		- false
	17	+ !(self.name.blank? or
	18	+ (self.data[:identidade_genero].blank? and self.data[:transgenero].blank?) or
	19	+ self.data[:etnia].blank? or
	20	+ self.data[:orientacao_sexual].blank? or
	21	+ self.data[:state].blank? or
	22	+ self.data[:city].blank?)
14	23	end
15	24
16	25	def points_by_type type
...	...
...	...	@@ -96,14 +96,14 @@ module Merit
96	96	profile_action: false
97	97	},
98	98	profile_completion: {
99		- action: ['account#create', 'account#update'],
100		- undo_action: 'account#destroy',
101		- to: lambda {\|user\| user.person},
	99	+ action: ['profile#create', 'profile#update'],
	100	+ undo_action: 'profile#destroy',
	101	+ to: :itself,
102	102	value: 1,
103	103	description: _('Profile Completion'),
104	104	default_weight: 100,
105	105	model_name: "User",
106		- condition: lambda {\|user\| user.person.profile_completion_score_condition },
	106	+ condition: lambda {\|person\| person.person? and person.profile_completion_score_condition },
107	107	profile_action: false
108	108	},
109	109	follower: {
...	...