Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sprint 4 Plan #15

Merged
merged 9 commits into from
Nov 12, 2024
Merged

Sprint 4 Plan #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
915b5cb
Fix for edit gallery project existance step
BranHill21 Oct 19, 2024
7098431
Merge branch 'master' of https://github.com/omarkhater-school/NXTFolio
BranHill21 Oct 19, 2024
5afbfc6
pulled changes from master
LikhithReddyM Nov 8, 2024
2430994
made UI changes to edit gellery
LikhithReddyM Nov 9, 2024
2dbcb96
Sprint 4 Plan added
LikhithReddyM Nov 9, 2024
bba5701
Revert "made UI changes to edit gellery"
LikhithReddyM Nov 9, 2024
631decb
revert to previous commit and added only Sprint 4 Plan document
LikhithReddyM Nov 9, 2024
feec80b
Revert "Sprint 4 Plan added"
LikhithReddyM Nov 10, 2024
b24e5fe
edit gallery test cases completed
LikhithReddyM Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
237 changes: 95 additions & 142 deletions app/controllers/galleries_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,150 +1,109 @@
# frozen_string_literal: true

class GalleriesController < ApplicationController
def new
@gallery = Gallery.new
end

#create the project, use params to sent the foreign key to gallery database
# create the project, use params to sent the foreign key to gallery database
def create
@general_info = GeneralInfo.find_by(userKey: session[:current_user_key])
params[:gallery][:GeneralInfo_id] = @general_info.id
@gallery = Gallery.new(gallery_params)
if @gallery.gallery_picture.length == 0
flash.now[:error] = "You should add at least 1 image!"
if @gallery.gallery_picture.empty?
flash.now[:error] = "Please add at least one image."
render 'new'

elsif @gallery.gallery_picture.length > 5
flash.now[:error] = "You can't add more than 5 images!"
flash.now[:error] = "You cannot add more than five images."
render 'new'


elsif @gallery.save
flash[:notice] = "Project Created"

flash[:notice] = "#{@gallery.gallery_title} has been successfully created."
redirect_to '/show_profile'
else
render 'new'
end
end

# def edit
# @gallery = Gallery.find(params[:id])
# if @gallery.update(gallery_params)
# redirect_to @gallery
# else
# render 'edit'
# end
# end
# def edit
# @gallery = Gallery.find(params[:id])
# end

# def update
# #@gallery = Gallery.find(params[:id])
# @gallery = Gallery.find(35)
# if @gallery.update(gallery_params)
# redirect_to @gallery
# else
# render 'edit'
# end
# end


# def update
# @gallery = Gallery.find(params[:id])
# if @gallery.update(gallery_params)
# redirect_to @gallery
# else
# render 'edit'
# end
# end
def edit
@gallery = Gallery.find(params[:id])
end

#2024fall: combine transfer and update function
def update
@gallery = Gallery.find(params[:id])
# for item in @gallery.test_picture do
# @gallery.gallery_picture.push(item)
# end
#@gallery.save!
#puts(@gallery.test_picture.length)
#puts("!!!!!!!")
if @gallery.update(gallery_params)
@gallery.save
if @gallery.test_picture.length == 0
flash.now[:error] = "Add at least 1 image!"
current_picture = @gallery.gallery_picture + @gallery.test_picture
if @gallery.gallery_picture.empty?
flash.now[:error] = "Please add at least one image."
render 'edit'
elsif current_picture.length > 5
flash.now[:error] = "The gallery cannot contain more than five images."
@gallery.test_picture.clear
@gallery.save
render 'edit'
else
flash[:notice] = "Images uploaded!"
redirect_to edit_gallery_path(params[:id])
@gallery.gallery_picture += @gallery.test_picture
@gallery.test_picture.clear
@gallery.save
flash[:notice] = "#{@gallery.gallery_title} has been successfully updated."
redirect_to @gallery
end
else
render 'edit'
end
end




def destroy
#logger.debug(@gallery_picture.inspect)
#remove_image_at_index(params[ :gallery_picture].to_i)
#remove_file(params[ :gallery_picture])
# logger.debug(@gallery_picture.inspect)
# remove_image_at_index(params[ :gallery_picture].to_i)
# remove_file(params[ :gallery_picture])
@gallery = Gallery.find(params[:id])
@gallery.destroy
redirect_to galleries_path
end

# spring2023 delete single image in the gallery
def delete
@gallery = Gallery.find(params[:id])
index_str = params[:idx]
index = (index_str).to_i
#puts(index.to_s + "!!!!!!!!!!")
img = @gallery.gallery_picture[index]
@gallery.gallery_picture.delete_at(index)
if img.in?(@gallery.test_picture)
@gallery.test_picture.delete(img)
end
@gallery.save
end

def delete
@gallery = Gallery.find(params[:id])
index = params[:idx].to_i
deleted_image = @gallery.gallery_picture.delete_at(index)
@gallery.save
flash.now[:notice] = "Image deleted successfully."
render 'edit'
end

# spring2023 add images to gallery
def transfer
@gallery = Gallery.find(params[:id])
limit = 5 - @gallery.gallery_picture.length
#puts(limit)
if @gallery.test_picture.length == 0
render 'edit'
elsif @gallery.test_picture.length > limit
puts("wrong!!!!!!!!!!!!")
if @gallery.test_picture.length > limit
flash.now[:error] = "You can not have more than 5 images in a gallery!"
@gallery.test_picture.clear
@gallery.save
render 'edit'
return
else
#puts("transfer running!!!!!!!!!!!")
puts("success!!!!!!!!!!!!")
added = @gallery.test_picture
@gallery.gallery_picture += added

@gallery.gallery_picture += @gallery.test_picture
flash[:success] = "successfully upload picture"
@gallery.test_picture.clear
@gallery.save
end
redirect_to @gallery
end


#def remove_file(gallery_picture)
#File.delete(gallery_picture)
#end

#def set_gallery
#@gallery = Gallery.find(params[:gallery_id])
#end
# def set_gallery
# @gallery = Gallery.find(params[:gallery_id])
# end

#def remove_image_at_index(index)
#remain_images = gallery_params # copy the array
#deleted_image = remain_gallery_picture.delete_at(index) # delete the target image
#deleted_image.try(:remove!) # delete image from S3
#@gallery.gallery_pictures = remain_images # re-assign back
#end
# def remove_image_at_index(index)
# remain_images = gallery_params # copy the array
# deleted_image = remain_gallery_picture.delete_at(index) # delete the target image
# deleted_image.try(:remove!) # delete image from S3
# @gallery.gallery_pictures = remain_images # re-assign back
# end

# def remove_image(image)
# @gallery.gallery_picture.delete(image)
Expand All @@ -158,86 +117,81 @@ def transfer
# redirect_to gallery, notice: 'Image was successfully removed.'
# end





#def index
#end
# def index
# end

def show

puts (params.inspect)
#@gallery = Gallery.find(params[:project_key])
puts(params.inspect)
# @gallery = Gallery.find(params[:project_key])
@gallery = Gallery.find(params[:id])


# NXTFolio : Added in Spring 2023 for tagging feature
@gallery_tagging = @gallery.gallery_taggings
logger.info("Debugging Average ")
current_user = GeneralInfo.find_by(userKey: session[:current_user_key])

logger.info('Debugging Average ')
current_user = GeneralInfo.find_by(userKey: session[:current_user_key])
if current_user
current_user_id = current_user.id
@collab_count = Collaboration.where(general_info_id: current_user_id).count

print("Users " + current_user_id.to_s + " collaborated with: ")
print("Users #{current_user_id} collaborated with: ")
print(@collab_count)
end

if @gallery.reviews.blank?
@average_review=0
else
@average_review=@gallery.reviews.average(:rating).round(2)
end
@average_review = if @gallery.reviews.blank?
0
else
@gallery.reviews.average(:rating).round(2)
end
end

# NXTFolio : Added function in Spring 2023 for tagging feature
def create_tagging
@gallery = Gallery.find_by(id: params[:id])
tagged_ids = params[:gallery_tagging][:tagged_user_id].split(",").reject(&:blank?)
tagged_ids = params[:gallery_tagging][:tagged_user_id].split(',').reject(&:blank?)
puts tagged_ids
tagged_ids.each do |tagged_id|
if GalleryTagging.where(gallery_id: params[:id], general_info_id: tagged_id).empty?
@gallery_tagging = GalleryTagging.new(gallery_id: params[:id], general_info_id: tagged_id)
if @gallery_tagging.save
flash[:notice] = "Tagged User(s) Successfully"
flash[:notice] = 'Tagged User(s) Successfully'
else
flash[:alert] = "Failed to Tag User(s)"
flash[:alert] = 'Failed to Tag User(s)'
end
end

current_user_id = GeneralInfo.find_by(userKey: session[:current_user_key]).id
print("Making collaboration between: " + current_user_id.to_s + " and " + tagged_id.to_s)
print("Making collaboration between: #{current_user_id} and #{tagged_id}")

if Collaboration.where(general_info_id: current_user_id, collaborator_id: tagged_id).empty?
@collab = Collaboration.new(general_info_id: current_user_id, collaborator_id: tagged_id)
if @collab.save
flash[:notice] = "Collaborations saved Successfully"
flash[:notice] = 'Collaborations saved Successfully'
else
flash[:alert] = "Failed to save Collaboration"
flash[:alert] = 'Failed to save Collaboration'
end
end
if Collaboration.where(general_info_id: tagged_id, collaborator_id: current_user_id).empty?
@collab = Collaboration.new(general_info_id: tagged_id, collaborator_id: current_user_id)
if @collab.save
flash[:notice] = "Collaborations saved Successfully"
else
flash[:alert] = "Failed to save Collaboration"
end
next unless Collaboration.where(general_info_id: tagged_id, collaborator_id: current_user_id).empty?

@collab = Collaboration.new(general_info_id: tagged_id, collaborator_id: current_user_id)
if @collab.save
flash[:notice] = 'Collaborations saved Successfully'
else
flash[:alert] = 'Failed to save Collaboration'
end
end
invited_email = params[:gallery_tagging][:invited_email]
if invited_email.present?
inviter_name = GeneralInfo.find_by(id:@gallery.GeneralInfo_id).first_name + " " + GeneralInfo.find_by(id:@gallery.GeneralInfo_id).last_name
invited_name = GeneralInfo.find_by(emailaddr: invited_email).first_name + " " + GeneralInfo.find_by(emailaddr: invited_email).last_name
inviter_name = "#{GeneralInfo.find_by(id: @gallery.GeneralInfo_id).first_name} #{GeneralInfo.find_by(id: @gallery.GeneralInfo_id).last_name}"
invited_name = "#{GeneralInfo.find_by(emailaddr: invited_email).first_name} #{GeneralInfo.find_by(emailaddr: invited_email).last_name}"
project_name = @gallery.gallery_title
project_key = params[:id]
InvitationMailer.invitation_email(invited_email,invited_name,inviter_name,project_name,project_key).deliver_now
InvitationMailer.invitation_email(invited_email, invited_name, inviter_name, project_name,
project_key).deliver_now
end
redirect_to '/show_profile'

end

def destroy_tagging
@gallery = Gallery.find(params[:gallery_id])
@tagging = @gallery.gallery_taggings.find(params[:id])
Expand All @@ -250,25 +204,23 @@ def destroy_tagging
def add_comment
@gallery = Gallery.find(params[:id])
end

# Fall 2023: Piyush Sharan: Post Comments
def post_comment
@gallery = Gallery.find(params[:id])
@comment = @gallery.comments.build(comment_params)
@user = GeneralInfo.find_by(userKey: session[:current_user_key])
@comment.comment_by = @user.first_name + " " + @user.last_name
@comment.comment_by = "#{@user.first_name} #{@user.last_name}"
# Fall 2023: Vishnuvasan: Added check for empty comment
if @comment.body.blank?
flash[:error] = "Comment cannot be empty."
flash[:error] = 'Comment cannot be empty.'
redirect_to gallery_path(@gallery)
elsif @comment.save
flash[:notice] = 'Comment added successfully.'
redirect_to gallery_path(@gallery)
else
if @comment.save
flash[:notice] = "Comment added successfully."
redirect_to gallery_path(@gallery)
else
flash.now[:alert] = "Failed to add comment."
render 'add_comment'
end
flash.now[:alert] = 'Failed to add comment.'
render 'add_comment'
end
end

Expand All @@ -290,16 +242,17 @@ def create_tag

def gallery_params
# NXTFolio : Added gallery_tagging in Spring 2023 for tagging feature
params.require(:gallery).permit(:id,:gallery, :gallery_title, :gallery_description, :ratings, :gallery_totalRate, :gallery_totalRator, :GeneralInfo_id, :gallery_tagging, :gallery_picture => [], :remove_image_ids => [], :test_picture => [])
params.require(:gallery).permit(:id, :gallery, :gallery_title, :gallery_description, :ratings, :gallery_totalRate,
:gallery_totalRator, :GeneralInfo_id, :gallery_tagging, gallery_picture: [], remove_image_ids: [], test_picture: [])
end

# NXTFolio : Added in Spring 2023 for tagging feature
def gallery_tagging_params
params.require(:gallery_tagging).permit(tagged_user_id: [] )
params.require(:gallery_tagging).permit(tagged_user_id: [])
end

# Fall 2023: To add Comments
def comment_params
params.require(:comment).permit(:body)
end
end
end
Loading
Loading