wordjelly-auth 1.1.7 → 1.1.8

data/app/models/auth/work/instruction.rb

@@ -22,5 +22,6 @@ class Auth::Work::Instruction
 
 	embeds_many :links, :class_name => "Auth::Work::Link"
 	embeds_many :bullets, :class_name => "Auth::Work::Bullet"
+	embeds_many :communications, :class_name => "Auth::Work::Communication", :as => :instruction_communications
 
 end

data/app/models/auth/work/minute.rb

@@ -246,72 +246,95 @@ class Auth::Work::Minute
 
 	
 
-	## okay first do what can be predictable done.
-	## that means the partials in the views.
-	## go for it.
-
-	## match where [cycle is a and cycle is primary] OR [cycle is b and cycle is primary, cycle is c and cycle is primary] present.
-	## then unwind the cycles
-	## so now we know that all these cycles even if they don't be primary, still belong to a minute with a primary
-	## now match only the useful cycles
-	## group by minutes
-	## add a field that combines the size of the avialable cycles + the distance from now
-	## sort by that.
-	## @param[Array] cycle_requirements_array : {cycle_id , worker_requirements :{"type" : number}, entity_requirements: {"type" : number}}
+	
+	## @param[Hash] cycles : {cycle_id => cycle}
 	## @param[Hash] transport_information : {distance : , coordinates :} 
 	## lets get the edit out of the way first.
-	def find_applicable_minute(cycle_requirements_array)
-		## go to elasticsearch for this ?
-		## ?
-		aggregations = [
-			{
-				"cycles" => {
-					"$elemMatch" => {
+	def self.find_applicable_minutes(cycles,transport_information={})
+		query_clause = {
+			"$match" => {
+				"$and" => [
+					{
 						"$or" => 
-						[
+							[
 
-						]
-					}
-				}	
-			},
-			{
-				"$unwind" => "$cycles"
-			},
-			{
-				## keep all cycles, dont enforce the belongs_to_minute at this level.
-				## just cycle_type and workers and entities
-				## since we want to include the 30 min rolling slots as well.
-				## we are only keeping the cycles which have the required type.
-				## and we can match again, 
-				"$match" => {
-					"cycles.cycle_type" => {
-						"$in" => "all_the_cycles"
+							]
+					},
+					{
+						"cycles" => {
+							"$elemMatch" => {
+								"$or" => [
+								]
+							}
+						}
 					}
-				} 
+				]
 			}
-		]
+		}
 
+		## that will be one api out of the way.
+		## next is also medicine.
 
+		## after this will be the aggregate phase.
 
-		cycle_requirements_array.each do |req|
-			aggregations[0]["cycles"]["$elemMatch"]["$or"] << {
-				"cycle_type" => req["cycle_type"], 
-				"workers_available.#{req['workers_count'] - 1}" => {
-					"$exists" => true
-				},
-				"entities_available.#{req['entities_count'] - 1}" => {
-					"$exists" => true
-				},
-				"belongs_to_minute" => true
+		combined_requirements = {}
+		individual_requirements = []
+		cycles.keys.each do |cycle_id|
+			cycle = cycles[cycle_id]
+			cycle_clause = {
+				"$and" => 
+				[
+
+				]
 			}
+			
+			cycle_clause["$and"] << {
+				"capacity" => cycle.capacity
+			}
+
+			## does the cycle have some kind of type ?
+			cycle_clause["$and"] << {
+				"cycle_type" => cycle.cycle_type
+			}
+
+			query_clause["$match"]["$and"][1]["cycles"]["$elemMatch"]["$or"] << cycle_clause
+
+
+			cycle_clause_for_entity_types = {
+				
+			}
+			
+			cycle.requirements.keys.each do |k|
+				combined_requirements[k] = 0 unless combined_requirements[k]
+				combined_requirements[k]+= cycle.requirements[k]
+				cycle_clause_for_entity_types["entity_types.#{k}"] =
+					{
+						"$gte" => cycle.requirements[k]
+					}
+				
+			end 
+
+			
+			query_clause["$match"]["$and"][0]["$or"] << cycle_clause_for_entity_types			
+
 		end
 
-		## we are going to get minutes that have at the minimum one of the cycles as belonging to the given minute.
+=begin
+		query_clause = [{
+			"$match" => {
+				"time" => {
+					"$exists" => true
+				}
+			}
+		}]
+=end		
+		puts "this is the generated query clause => "
+		puts JSON.pretty_generate(query_clause)
+
+
+		Auth::Work::Minute.collection.aggregate([query_clause])
 
-		## now we are going to unwind the cycles, 
-		## keep only those which satisfy these conditions.
 
-		## we take a look at other cycles which will be affected only if that cycle, is not already booked, otherwise it doesnt make any difference at all.
 
 	end
 

data/app/views/auth/images/_form.html.erb

@@ -4,8 +4,8 @@
 
   the parent id and class
 
+  <!-- here we add the recaptcha if it says so in the configuration --> 
   
- 
   <%= f.hidden_field :parent_id, :value => @model.parent_id %>
 
   <%= f.hidden_field :parent_class, :value => @model.parent_class %>    

data/app/views/auth/images/_image_concern.html.erb

@@ -1,4 +1,4 @@
-<div id="image_id"><%= BSON::ObjectId.new.to_s %></div>
-<div id="parent_id"><%= @model.id.to_s %></div>
-<div id="parent_class"><%= @model.class.name.to_s %></div>
+<div id="image_id" style="display:none;"><%= BSON::ObjectId.new.to_s %></div>
+<div id="parent_id" style="display:none;"><%= @model.id.to_s %></div>
+<div id="parent_class" style="display:none;"><%= @model.class.name.to_s %></div>
 <div id="upload_widget_opener"></div>

data/app/views/auth/send_mail/send.html.erb

@@ -0,0 +1 @@
+hi this is the email.

data/app/views/auth/shopping/products/show/_summary.html.erb

@@ -16,5 +16,17 @@
           		<span class="m-20-left"><%= Auth.configuration.currency %> <%= product.price %>/-</span>
           	</div>
 	    </li>
+	    <li class="collection-item">
+		    <div>
+		    	<i class="material-icons icon-align green-text">create</i>
+		    	<span class="m-20-left"><%= link_to "Edit Product", edit_product_path(product.id.to_s) %></span>
+		    </div>
+	    </li>
+	    <li class="collection-item">
+	    	<div>
+		    	<i class="material-icons icon-align blue-text">note_add</i>
+		    	<span class="m-20-left"><%= link_to "Add New Instruction", new_instruction_path(:product_id => product.id.to_s) %></span>
+		    </div>
+	    </li>
 	</ul>
 </div>

data/app/views/auth/work/communications/_form.html.erb

@@ -0,0 +1,57 @@
+<%= form_for(@auth_work_communication, as: "communication", url: @auth_work_communication.new_record? ? communications_path : communication_path(:id => @auth_work_communication.id.to_s), method: @auth_work_communication.new_record? ? :post : :put) do |f| %>
+	<div class="form_fields">
+		<div id="email_options">
+		  	<h5>E-Mail Options</h5>
+		  	<%= f.check_box :send_email,{},true,false %>
+	      	<%= f.label  :send_email %>
+
+	      	<%= f.text_field :email_template_path %>
+	      	<%= f.label :email_template_path %>
+	    </div>
+
+	    <div class="divider"> </div>
+
+	    <div id="repeat_options">
+	    	<h5>Repeat Options</h5>
+	    	<%= f.select :repeat,@auth_work_communication.repeat_options,{include_blank: true} %>
+	    	
+	    	<%= f.number_field :repeat_times %>
+	    	<%= f.label :repeat_times %>
+
+	    	<%= f.text_field :method_to_determine_communication_timing %>
+	    	<%= f.label :method_to_determine_communication_timing %>
+
+	    </div>
+
+	    <div class="divider"></div>
+
+	    <div id="general_options">
+
+	    	<%= f.text_field :method_to_determine_recipients %>
+	    	<%= f.label :method_to_determine_recipients %>
+
+
+		    <% if @auth_work_communication.cycle_id %>
+		      	<%= 
+		      		hidden_field_tag :cycle_id, @auth_work_communication.cycle_id.to_s
+		      	%>
+		    <% end %>
+
+	      	<% if @auth_work_communication.instruction_id %>
+		    	<%=
+		      		hidden_field_tag :instruction_id, @auth_work_communication.instruction_id.to_s %> 
+		    	%>
+	      	<% end %>
+
+	    </div>
+
+    </div>
+    <div class="actions">
+    	<%= f.submit %>
+  	</div>
+<% end %>
+
+<!-- now in order to get this to render, first i need to fix instruction -->
+<!-- then will create some product, and inside that have to give buttons to make instructions and also bullets -->
+<!-- so let me first add , the add instruction to the product -->
+<!-- also let me first do the image upload integration also -->

data/app/views/auth/work/instructions/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for(@auth_work_instruction, as: "instruction", url: instruction_path, method: :put) do |f| %>
+<%= form_for(@auth_work_instruction, as: "instruction", url: @auth_work_instruction.new_record? ? instructions_path : instruction_path(:id => @auth_work_instruction.id), method: @auth_work_instruction.new_record? ? :post : :put) do |f| %>
 	<div class="form_fields">
 		  <%=
 	          f.text_field :title
@@ -9,6 +9,12 @@
 	      <%= 
 	      	  hidden_field_tag :product_id, @auth_shopping_product.id.to_s
 	      %>
+	      <% if @auth_work_instruction.new_record? %>
+	      	<h6>In order to upload images / videos you need to first save this record</h6>
+	      <% else %>
+	      	<% @model = @auth_work_instruction %>
+	      	<%= render :partial => "auth/images/image_concern.html.erb" %>
+	      <% end %>
     </div>
     <div class="actions">
     	<%= f.submit %>

data/app/views/auth/work/instructions/_image.html.erb

@@ -0,0 +1,5 @@
+<% if instruction.images.size > 0 %>
+  <img src="<%= instruction.images.first.get_url %>" class="circle" height="30px" width="35px" />
+<% else %>
+  <img src="/assets/placeholder.png" alt="" class="circle" height="30px" width="35px">
+<% end %>

data/app/views/auth/work/instructions/new.html.erb

@@ -0,0 +1 @@
+<%= render :partial => "form.html.erb" %>

data/app/views/auth/work/instructions/show.html.erb

@@ -0,0 +1 @@
+<%= render :partial => "show", locals: {instruction: @auth_work_instruction, product: @auth_shopping_product} %>

data/app/views/layouts/send_mail.html.erb

@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/lib/auth/engine.rb

@@ -84,10 +84,16 @@ module Auth
     attr_accessor :instruction_controller
     attr_accessor :bullet_class
     attr_accessor :bullet_controller
+    attr_accessor :communication_class
+    attr_accessor :communication_controller
     ## the class used in the user_concern, to send emails.
     ## should inherit from Auth::Notifier.
     ## the class used to send the notification
     attr_accessor :mailer_class
+
+    ## the new mailer class being used in Auth::Work::Notification.
+    attr_accessor :new_mailer_class
+    attr_accessor :mail_from
      
     ## the queue adapter for the delayed jobs
     ## @used in OtpJob
@@ -185,6 +191,9 @@ module Auth
 
     attr_accessor :image_class
     attr_accessor :image_controller
+    ## basically does not apply if the user is signed in.
+    ## otherwise will apply.
+    attr_accessor :protect_image_with_recaptcha
 
 
     #######################################################
@@ -204,6 +213,12 @@ module Auth
 
     attr_accessor :endpoint_controller
 
+    attr_accessor :cycle_class
+
+    attr_accessor :cycle_controller
+
+
+
     def initialize
       
 
@@ -309,8 +324,8 @@ module Auth
       @notification_class = nil
       @notification_response_class = nil
 
-      
-      
+      @new_mailer_class = "Auth::SendMail"
+      @mail_from = "bhargav.r.raut@gmail.com"
       
       ###############################################################
       ##
@@ -319,7 +334,7 @@ module Auth
       ###############################################################
       @queue_adapter = "shoryuken"
 
-      
+      ## command : 
       ####################################################
       ##
       ##
@@ -415,7 +430,7 @@ module Auth
       ########################################################
       @image_class = "Auth::Image"
       @image_controller = "auth/images"
-
+      @protect_image_with_recaptcha = true
 
       ########################################################
       ##
@@ -429,12 +444,27 @@ module Auth
       ########################################################
       ##
       ## ENDPOINT CLASS.
+      ## for amazon and aws notifications.
       ##
       ########################################################
       @endpoint_class = "Auth::Endpoint"
       @endpoint_controller = "auth/endpoints"
 
 
+      ########################################################
+      ##
+      ##
+      ## WORK CLASSES
+      ##
+      ##
+      ########################################################
+      @communication_controller = "auth/work/communications"
+      @communication_class = "Auth::Work::Communication"
+
+      @cycle_controller = "auth/work/cycles"
+      @cycle_class = "Auth::Work::Cycle"
+
+
     end
   end
   

data/lib/auth/rails/routes.rb

@@ -16,7 +16,7 @@ module ActionDispatch::Routing
  	 		end
  	 	end
 
- 	 	puts "scope path is: #{scope_path}"
+ 	 	#puts "scope path is: #{scope_path}"
  	 	scope_path
 
   	end
@@ -38,7 +38,7 @@ module ActionDispatch::Routing
   		Auth.configuration.send("#{model}_class").underscore.pluralize.scan(/(?<scope_path>.+?)\/(?<collection>[A-Za-z_]+)$/) do 
  	 		collection = Regexp.last_match[:collection]
  	 	end
- 	 	puts "collection is :#{collection}"
+ 	 	#puts "collection is :#{collection}"
  	 	collection
   	end
 
@@ -121,7 +121,10 @@ module ActionDispatch::Routing
 		  end
 
 
-			["cart_item","cart","payment","product","discount","image","bullet","instruction"].each do |model|
+			["cart_item","cart","payment","product","discount","image","bullet","instruction","communication"].each do |model|
+
+				## establish a communication controller, model, views and engine constants with defaults.
+
 
 				if Auth.configuration.send("#{model}_controller")
 
@@ -132,13 +135,7 @@ module ActionDispatch::Routing
 
 			 	 	if collection
 
-			 	 		## what about the route for this ?
-
-			 	 		
-
-			 	 		## okay so what and how much longer ?
-			 	 		## probably till night.
-			 	 		## 
+			 	 		 
 			 	 		if model == "bullet" 
 			 	 			 
 			 	 			resources collection.to_sym, controller: controller_name, path: "/auth/work/bullets"
@@ -147,6 +144,9 @@ module ActionDispatch::Routing
 			 	 			
 			 	 			resources collection.to_sym, controller: controller_name, path: "/auth/work/instructions"	
 
+			 	 		elsif model == "communication"
+
+			 	 			resources collection.to_sym, controller: controller_name, path: "/auth/work/communications"
 			 	 		else
 			 	 			scope :path => scope_path, :as => as_prefix do
 				 	 		
@@ -228,7 +228,7 @@ module ActionDispatch::Routing
 						common_callback_path = Auth::OmniAuth::Path.common_callback_path(provider)
 
 						if !Rails.application.routes.url_helpers.method_defined?("#{provider}_omniauth_authorize_path".to_sym)
-							puts "calling route for provider: #{provider}"
+							#puts "calling route for provider: #{provider}"
 							match "#{omniauth_request_path}", controller: omniauth_ctrl, action: "passthru", via: [:get,:post], as: "#{provider}_omniauth_authorize"
 						end
 

data/lib/auth/version.rb

@@ -1,3 +1,3 @@
 module Auth
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -14,5 +14,3 @@
 //= require images
 //= require_tree .
 
-
- 

data/spec/dummy/app/assets/javascripts/images.js

@@ -1,21 +1,3 @@
-$(document).ready(function(){
-
-  if($.fn.cloudinary_fileupload !== undefined) {
-    $("input.cloudinary-fileupload[type=file]").cloudinary_fileupload();
-  	console.log("cloudinary is defined");
-  }
-  else{
-  	console.log("cloudinary is undefined");
-  }
-
-  
-	$('#upload_widget_opener').cloudinary_upload_widget(
-	{ cloud_name: "doohavoda", api_key:"779116626984783", upload_signature: generateSignature,
-	public_id: $("#image_id").text()},
-	function(error, result) { console.log(error, result) });
-  	
-});
-
 var generateSignature = function(callback, params_to_sign){
 	params_to_sign["_id"] = $("#image_id").text();
 	params_to_sign["parent_id"] = $("#parent_id").text();
@@ -33,4 +15,12 @@ var generateSignature = function(callback, params_to_sign){
      	 callback(signature); },
      	error   : function(xhr, status, error) { console.log(xhr, status, error); }
     });
-}
+}
+
+
+document.addEventListener("turbolinks:load", function() {
+  $('#upload_widget_opener').cloudinary_upload_widget(
+  { cloud_name: "doohavoda", api_key:"393369625566631", upload_signature: generateSignature,
+  public_id: $("#image_id").text()},
+  function(error, result) { console.log(error, result) });
+})