Skip to content

Commit

Permalink
Merge pull request Chore-Swap#84 from sarahlessner/sarah-branch-10
Browse files Browse the repository at this point in the history 
fixed a couple conflicts in match_display.js
  • Loading branch information
@sarahlessner
sarahlessner committed Aug 24, 2017
2 parents 1ac9662 + a86e1c8 commit 20fed79
Showing 1 changed file with 14 additions and 151 deletions.
165 changes: 14 additions & 151 deletions assets/js/match_display.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,151 +7,6 @@ $(document).ready(function() {

// console.log("matchDisplay loading");


displayPerfect();
//get all the users offers and receive their perfect matches back as data
function displayPerfect() {
// $(".da_tabs").removeClass("active");
// $(this).addClass("active");
$("#main_results").empty();
$("#main_results").append("<p>"+"calculating perfect matches..."+"<p>");
console.log("running displayPerfect");
//TODO: Enable ID from local storage for 'production'
var userid = localStorage.userid;
// var userid = 1;
//TODO: figure out where UserId param ought to come
//from the page redirect/data
$.get("/homepage/perfectmatch/" + userid, function(data) {
$("#main_results").empty();
console.log("PERFECT MATCH", data);
for (var i = 0; i < data.length; i++) {
// if (data[i][0].User.id != localStorage.userid) {
if (isNotCurrentUser(data[i][0].User.id, localStorage.userid)) {
var email = data[i][0].User.email;
var perfect_match_html ='<div class="row perfect_matches">'+
'<div class="col-md-4 user_deets">' +
' <h3>' + data[i][0].User.name + '</h3>' +
'<img class="user_photos" src="'+
data[i][0].User.photo+'"/>' +
'</div>' +
'<div class="col-md-6 offer_n_exchange">' +
'<h3> Offer: </h3>' +
'<h4>'+ data[i][1].skill_name +'</h4>' +
'<h3>Exchange: </h3>' +
'<h4>'+ data[i][0].Skill.skill_name +'</h4>' +
'</div>' +
'<div class="col-md-2">' +
'<button class="match_buttons">Contact<a class="mailto" href="mailto:'+email+'Mail</a></button>'+
'</div>';

$("#main_results").append(perfect_match_html);
}
}
});
};


function displayOfferMatch() {
// $(".da_tabs").removeClass("active");
// $(this).addClass("active");
$("#main_results").empty();
$("#main_results").append("<p>"+"brb getting something from the back..."+"<p>");
// console.log("running displayOfferMatch");
var userid = localStorage.userid;
$.get("/homepage/offermatch/" + userid, function(data) {
$("#main_results").empty();
// console.log("OK Match", data);
for (var i = 0; i < data.length; i++) {
for (var j = 0; j < data[i].length; j++) {
if (isNotCurrentUser(data[i][j].User.id, localStorage.userid)) {

var email = data[i][j].User.email;
var offer_match_html = '<div class="row offer_matches">' +
'<div class="col-md-2 user_deets">' +
'<h3>'+data[i][j].User.name+'</h3>' +
'<img class="offer_photos" src="'+data[i][j].User.photo+'">' +
'</div>' +
'<div class="col-md-8 offer_element">' +
'<div class="offer_text">'+
'<h3> Offer: </h3> '+
'<h4>' + data[i][j].Skill.skill_name + '</h4>'+
'</div>' +
'</div>' +
'<div class="col-md-2 offer_element">' +
// '<br><br>' +
'<button class="offer_buttons">Contact<a class="mailto" href="mailto:'+email+'Mail</a></button>'+
'</div>' +
'</div>';

$("#main_results").append(offer_match_html);
}
}
}
});
};
function displayOffersBySkill() {
// console.log("running displayOffersBySkill");
// $(".da_tabs").removeClass("active");
// $(this).addClass("active");
$("#main_results").empty();
$("#main_results").append("<p>"+"loading mad skills..."+"<p>");

$.get("/alloffersbyskill", function(data) {
$("#main_results").empty();
// console.log("All Skills Joined w Offers", data);
//create a button for each skill
for (var i = 0; i < data.length; i++) {
console.log("data", data[i]);

var addedDiv = false;
var $skills;

for (var j = 0; j < data[i].length; j++) {
if (isNotCurrentUser(data[i][j].User.id, localStorage.userid)) {
if(!addedDiv) {
$skills = $('<div class="all_skills"></div>');
$skills.append($('<h3>'+ data[i][0].Skill.skill_name +'</h3>'));
addedDiv = true;
}

var user_html = '<div class="all_users">' +
'<h4>'+ data[i][j].User.name +'</h4>' +
'<img class="all_users_pics" src="'+data[i][j].User.photo+'"/>' +
'<button class="all_users_buttons">Contact<a class="mailto" href="mailto:'+'email'+'Mail</a></button>'+
'</div>';

$skills.append(user_html);
}
}
$("#main_results").append($skills);


}

});
};

$("#perfectmatch").on("click", displayPerfect);
$("#offermatch").on("click", displayOfferMatch);
$("#offersbyskill").on("click", displayOffersBySkill);

function set_tab_active(){
$(".da_tabs").removeClass("active");
}

//broke this function out just to try my hand at testing
"use strict";
var isNotCurrentUser = function(matchid, userid) {
if (matchid != userid) {
return true;
}
};
//for testing
module.exports = isNotCurrentUser;
//document.ready end
=======
// console.log("matchDisplay loading");

displayPerfect();
//get all the users offers and receive their perfect matches back as data
function displayPerfect() {
Expand All @@ -175,9 +30,9 @@ module.exports = isNotCurrentUser;
$("#main_results").append('<img id="no_matches" src="../img/sorry.png"/>')
.append('<h3 style="color:#4e638a">No Matches Found. Adding more skills can help!</h3>')
.append('<button id="add_button2">Add another skill?</button>')
} else{
} else {
for (var i = 0; i < data.length; i++) {
if (data[i][0].User.id != localStorage.userid) {
if (isNotCurrentUser(data[i][0].User.id, localStorage.userid)) {

var email = data[i][0].User.email;
var perfect_match_html = '<div class="row perfect_matches">' +
Expand Down Expand Up @@ -215,7 +70,7 @@ module.exports = isNotCurrentUser;
// console.log("OK Match", data);
for (var i = 0; i < data.length; i++) {
for (var j = 0; j < data[i].length; j++) {
if (data[i][j].User.id != localStorage.userid) {
if (isNotCurrentUser(data[i][j].User.id, localStorage.userid)) {

var email = data[i][j].User.email;
var offer_match_html = '<div class="row offer_matches">' +
Expand Down Expand Up @@ -260,7 +115,7 @@ module.exports = isNotCurrentUser;
var $skills;

for (var j = 0; j < data[i].length; j++) {
if (data[i][j].User.id != localStorage.userid) {
if (isNotCurrentUser(data[i][j].User.id, localStorage.userid)) {
if (!addedDiv) {
$skills = $('<div class="all_skills"></div>');
$skills.append($('<h3>' + data[i][0].Skill.skill_name + '</h3>'));
Expand Down Expand Up @@ -292,9 +147,17 @@ module.exports = isNotCurrentUser;
$(".da_tabs").removeClass("active");
}

//broke this function out just to try my hand at testing
"use strict";
var isNotCurrentUser = function(matchid, userid) {
if (matchid != userid) {
return true;
}
};
//for testing
module.exports = isNotCurrentUser;
//document.ready end


//document.ready end

});

0 comments on commit 20fed79

Please sign in to comment.