{"action":"created","comment":{"url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/comments/34011670","id":34011670,"diff_hunk":"@@ -1,238 +1,247 @@\n+var treeSeedAppControllers = angular.module('treeSeed.controller',\n+\t\t[ 'treeSeed.services' ]);\n+\n+/**\n+ * ************************************************Prototype\n+ * Controllers******************************************\n+ */\n+\n+treeSeedAppControllers.controller('leftMenuCtrl', function($state,\n+\t\t$location, $sharedData, $scope) {\n+\t$scope.getMenu = function() {\n+\t\tif ($sharedData.getUserType() == \"NGO\") {\n+\t\t\treturn \"layouts/components/nGOMenu.html\";\n+\t\t} else if($sharedData.getUserType() == \"Donor\") {\n+\t\t\treturn \"layouts/components/donorMenu.html\";\n+\t\t}\n+\t}\n+});\n+\n+treeSeedAppControllers.controller('headerMenuCtrl', function($state, $location,\n+\t\t$sharedData, $scope) {\n+\t$scope.nom = $sharedData.getLoggedUser();\n+\t$scope.img = $sharedData.getImg();\n+\t$scope.isUserLogged = $sharedData.isUserLogged();\n+\n+});\n+\n+treeSeedAppControllers.controller('mainContentCtrl', function($state, $location,\n+\t\t$sharedData, $scope) {\n+\n+\t$scope.isUserLogged = $sharedData.isUserLogged();\n+\n+});\n+\n+treeSeedAppControllers.controller('showToUserController', function($state,\n+\t\t$location, $sharedData, $scope) {\n+\n+\t$scope.view = function() {\n+\t\tif ($sharedData.getUserType() == \"\") {\n+\t\t\treturn false;\n+\t\t} else {\n+\t\t\treturn true;\n+\t\t}\n+\t}\n+\n+});\n+\n+treeSeedAppControllers.controller('searchTransparecyReportController',\n+\t\tfunction($state, $location, $sharedData, $scope) {\n \n-var treeSeedAppControllers = angular.module('treeSeed.controller',['treeSeed.services']);\n+\t\t\tif ($sharedData.getLoged() != true) {\n+\t\t\t\t$scope.resul = false;\n+\t\t\t\t$scope.ong = $sharedData.getOngName();\n \n+\t\t\t\t$scope.search = function() {\n+\t\t\t\t\t$scope.resul = true;\n+\t\t\t\t};\n \n+\t\t\t} else {\n+\t\t\t\t$state.go('signin');\n+\t\t\t}\n+\t\t});\n \n-/**************************************************Prototype Controllers*******************************************/\n \n \n+treeSeedAppControllers.controller('indexController', function($state,\n+\t\t$location, $sharedData, $scope) {\n \n+\tconsole.log('test');\n \n-treeSeedAppControllers.controller('menuController', function($state, $location,$sharedData, $scope) {\n-    $scope.getMenu=function(){\n-      if($sharedData.getUserType() == \"ONG\"){\n-          return  \"layouts/components/aside.html\";\n-      }else{\n-          return \"layouts/components/asideDonor.html\" ;\n-      }\n-    }\n-    \n+});\n+\n+treeSeedAppControllers.controller('logoutController', function($sharedData,\n+\t\t$location, $scope, $state) {\n+\t$scope.logout = function() {\n+\t\t$sharedData.setLoggedUser('');\n+\t\t$sharedData.setLoged(false);\n+\t\t$state.go('signin');\n+\t}\n+});\n+\n+treeSeedAppControllers.controller('navigateController', function($state,\n+\t\t$location, $sharedData, $scope) {\n+\t$scope.navigateDonor = function() {\n+\t\t$state.go('treeSeed.donor');\n+\t}\n \n+\t$scope.navigateONG = function() {\n+\t\t$state.go('treeSeed.nonProfit');\n+\t}\n \n+\t$scope.navigateCampaing = function() {\n+\t\t$state.go('treeSeed.campaingViewer');\n+\t}\n });\n \n-treeSeedAppControllers.controller('showToUserController', function($state, $location,$sharedData, $scope) {\n-   \n-   $scope.view=function(){\n-      if($sharedData.getUserType()==\"ONG\"){\n-       return false;\n-    }else{\n-        return true;\n-    }\n-   } \n-    \n+treeSeedAppControllers.controller('SigninFormController', function($scope,\n+\t\t$http, $state, $userData, $sharedData, $location) {\n+\tif ($sharedData.getLoged() == false) {\n+\t\t$scope.authError = null;\n+\t\t$scope.users = $userData.getUsers();\n+\t\t$scope.login = function() {\n+\t\t\tconsole.log('tes');\n+\t\t\tvar totalUsers = $scope.users.length;\n+\t\t\tvar usernameTyped = $scope.user.name;\n+\t\t\tvar useremail = $scope.user.email;\n+\t\t\tvar passwordTyped = $scope.user.password;\n+\t\t\tvar name = \"\";\n+\t\t\tvar img = \"\";\n+\t\t\tvar userType = \"\";\n+\t\t\tvar loggedin = false;","path":"Treeseed/src/main/webapp/resources/js/controllers/treeSeedControllers.js","position":132,"original_position":132,"commit_id":"92a21e4a84e030b855aa5d4a36a1ffd6b41424c9","original_commit_id":"92a21e4a84e030b855aa5d4a36a1ffd6b41424c9","user":{"login":"fafa0293","id":4842952,"avatar_url":"https://avatars.githubusercontent.com/u/4842952?v=3","gravatar_id":"","url":"https://api.github.com/users/fafa0293","html_url":"https://github.com/fafa0293","followers_url":"https://api.github.com/users/fafa0293/followers","following_url":"https://api.github.com/users/fafa0293/following{/other_user}","gists_url":"https://api.github.com/users/fafa0293/gists{/gist_id}","starred_url":"https://api.github.com/users/fafa0293/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fafa0293/subscriptions","organizations_url":"https://api.github.com/users/fafa0293/orgs","repos_url":"https://api.github.com/users/fafa0293/repos","events_url":"https://api.github.com/users/fafa0293/events{/privacy}","received_events_url":"https://api.github.com/users/fafa0293/received_events","type":"User","site_admin":false},"body":"in en mayuscula","created_at":"2015-07-07T06:48:47Z","updated_at":"2015-07-07T06:48:47Z","html_url":"https://github.com/jcdEsquivel/Proyecto-3/pull/8#discussion_r34011670","pull_request_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/8","_links":{"self":{"href":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/comments/34011670"},"html":{"href":"https://github.com/jcdEsquivel/Proyecto-3/pull/8#discussion_r34011670"},"pull_request":{"href":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/8"}}},"pull_request":{"url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/8","id":39334369,"html_url":"https://github.com/jcdEsquivel/Proyecto-3/pull/8","diff_url":"https://github.com/jcdEsquivel/Proyecto-3/pull/8.diff","patch_url":"https://github.com/jcdEsquivel/Proyecto-3/pull/8.patch","issue_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/issues/8","number":8,"state":"open","locked":false,"title":"Landing page y Aramis hu landing page","user":{"login":"aramiscubillo","id":10282609,"avatar_url":"https://avatars.githubusercontent.com/u/10282609?v=3","gravatar_id":"","url":"https://api.github.com/users/aramiscubillo","html_url":"https://github.com/aramiscubillo","followers_url":"https://api.github.com/users/aramiscubillo/followers","following_url":"https://api.github.com/users/aramiscubillo/following{/other_user}","gists_url":"https://api.github.com/users/aramiscubillo/gists{/gist_id}","starred_url":"https://api.github.com/users/aramiscubillo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aramiscubillo/subscriptions","organizations_url":"https://api.github.com/users/aramiscubillo/orgs","repos_url":"https://api.github.com/users/aramiscubillo/repos","events_url":"https://api.github.com/users/aramiscubillo/events{/privacy}","received_events_url":"https://api.github.com/users/aramiscubillo/received_events","type":"User","site_admin":false},"body":"Landing page y configuración del idioma.","created_at":"2015-07-07T04:34:00Z","updated_at":"2015-07-07T06:48:47Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e47af07ae532db33fe93d1528480af40f89d9aca","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/8/commits","review_comments_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/8/comments","review_comment_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/comments{/number}","comments_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/issues/8/comments","statuses_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/statuses/92a21e4a84e030b855aa5d4a36a1ffd6b41424c9","head":{"label":"jcdEsquivel:Aramis-HULandingPage","ref":"Aramis-HULandingPage","sha":"92a21e4a84e030b855aa5d4a36a1ffd6b41424c9","user":{"login":"jcdEsquivel","id":12477680,"avatar_url":"https://avatars.githubusercontent.com/u/12477680?v=3","gravatar_id":"","url":"https://api.github.com/users/jcdEsquivel","html_url":"https://github.com/jcdEsquivel","followers_url":"https://api.github.com/users/jcdEsquivel/followers","following_url":"https://api.github.com/users/jcdEsquivel/following{/other_user}","gists_url":"https://api.github.com/users/jcdEsquivel/gists{/gist_id}","starred_url":"https://api.github.com/users/jcdEsquivel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jcdEsquivel/subscriptions","organizations_url":"https://api.github.com/users/jcdEsquivel/orgs","repos_url":"https://api.github.com/users/jcdEsquivel/repos","events_url":"https://api.github.com/users/jcdEsquivel/events{/privacy}","received_events_url":"https://api.github.com/users/jcdEsquivel/received_events","type":"User","site_admin":false},"repo":{"id":35742356,"name":"Proyecto-3","full_name":"jcdEsquivel/Proyecto-3","owner":{"login":"jcdEsquivel","id":12477680,"avatar_url":"https://avatars.githubusercontent.com/u/12477680?v=3","gravatar_id":"","url":"https://api.github.com/users/jcdEsquivel","html_url":"https://github.com/jcdEsquivel","followers_url":"https://api.github.com/users/jcdEsquivel/followers","following_url":"https://api.github.com/users/jcdEsquivel/following{/other_user}","gists_url":"https://api.github.com/users/jcdEsquivel/gists{/gist_id}","starred_url":"https://api.github.com/users/jcdEsquivel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jcdEsquivel/subscriptions","organizations_url":"https://api.github.com/users/jcdEsquivel/orgs","repos_url":"https://api.github.com/users/jcdEsquivel/repos","events_url":"https://api.github.com/users/jcdEsquivel/events{/privacy}","received_events_url":"https://api.github.com/users/jcdEsquivel/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jcdEsquivel/Proyecto-3","description":"","fork":false,"url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3","forks_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/forks","keys_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/teams","hooks_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/hooks","issue_events_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/issues/events{/number}","events_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/events","assignees_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/assignees{/user}","branches_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/branches{/branch}","tags_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/tags","blobs_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/git/refs{/sha}","trees_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/statuses/{sha}","languages_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/languages","stargazers_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/stargazers","contributors_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/contributors","subscribers_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/subscribers","subscription_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/subscription","commits_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/commits{/sha}","git_commits_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/git/commits{/sha}","comments_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/comments{/number}","issue_comment_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/issues/comments{/number}","contents_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/contents/{+path}","compare_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/merges","archive_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/downloads","issues_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/issues{/number}","pulls_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls{/number}","milestones_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/milestones{/number}","notifications_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/labels{/name}","releases_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/releases{/id}","created_at":"2015-05-16T22:18:26Z","updated_at":"2015-06-30T02:49:19Z","pushed_at":"2015-07-07T06:48:13Z","git_url":"git://github.com/jcdEsquivel/Proyecto-3.git","ssh_url":"git@github.com:jcdEsquivel/Proyecto-3.git","clone_url":"https://github.com/jcdEsquivel/Proyecto-3.git","svn_url":"https://github.com/jcdEsquivel/Proyecto-3","homepage":null,"size":6276,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":6,"forks":0,"open_issues":6,"watchers":0,"default_branch":"master"}},"base":{"label":"jcdEsquivel:master-dev","ref":"master-dev","sha":"f03f2224153d1fafb147e9be2bef7a89a84aac46","user":{"login":"jcdEsquivel","id":12477680,"avatar_url":"https://avatars.githubusercontent.com/u/12477680?v=3","gravatar_id":"","url":"https://api.github.com/users/jcdEsquivel","html_url":"https://github.com/jcdEsquivel","followers_url":"https://api.github.com/users/jcdEsquivel/followers","following_url":"https://api.github.com/users/jcdEsquivel/following{/other_user}","gists_url":"https://api.github.com/users/jcdEsquivel/gists{/gist_id}","starred_url":"https://api.github.com/users/jcdEsquivel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jcdEsquivel/subscriptions","organizations_url":"https://api.github.com/users/jcdEsquivel/orgs","repos_url":"https://api.github.com/users/jcdEsquivel/repos","events_url":"https://api.github.com/users/jcdEsquivel/events{/privacy}","received_events_url":"https://api.github.com/users/jcdEsquivel/received_events","type":"User","site_admin":false},"repo":{"id":35742356,"name":"Proyecto-3","full_name":"jcdEsquivel/Proyecto-3","owner":{"login":"jcdEsquivel","id":12477680,"avatar_url":"https://avatars.githubusercontent.com/u/12477680?v=3","gravatar_id":"","url":"https://api.github.com/users/jcdEsquivel","html_url":"https://github.com/jcdEsquivel","followers_url":"https://api.github.com/users/jcdEsquivel/followers","following_url":"https://api.github.com/users/jcdEsquivel/following{/other_user}","gists_url":"https://api.github.com/users/jcdEsquivel/gists{/gist_id}","starred_url":"https://api.github.com/users/jcdEsquivel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jcdEsquivel/subscriptions","organizations_url":"https://api.github.com/users/jcdEsquivel/orgs","repos_url":"https://api.github.com/users/jcdEsquivel/repos","events_url":"https://api.github.com/users/jcdEsquivel/events{/privacy}","received_events_url":"https://api.github.com/users/jcdEsquivel/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jcdEsquivel/Proyecto-3","description":"","fork":false,"url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3","forks_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/forks","keys_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/teams","hooks_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/hooks","issue_events_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/issues/events{/number}","events_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/events","assignees_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/assignees{/user}","branches_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/branches{/branch}","tags_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/tags","blobs_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/git/refs{/sha}","trees_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/statuses/{sha}","languages_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/languages","stargazers_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/stargazers","contributors_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/contributors","subscribers_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/subscribers","subscription_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/subscription","commits_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/commits{/sha}","git_commits_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/git/commits{/sha}","comments_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/comments{/number}","issue_comment_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/issues/comments{/number}","contents_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/contents/{+path}","compare_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/merges","archive_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/downloads","issues_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/issues{/number}","pulls_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls{/number}","milestones_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/milestones{/number}","notifications_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/labels{/name}","releases_url":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/releases{/id}","created_at":"2015-05-16T22:18:26Z","updated_at":"2015-06-30T02:49:19Z","pushed_at":"2015-07-07T06:48:13Z","git_url":"git://github.com/jcdEsquivel/Proyecto-3.git","ssh_url":"git@github.com:jcdEsquivel/Proyecto-3.git","clone_url":"https://github.com/jcdEsquivel/Proyecto-3.git","svn_url":"https://github.com/jcdEsquivel/Proyecto-3","homepage":null,"size":6276,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":6,"forks":0,"open_issues":6,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/8"},"html":{"href":"https://github.com/jcdEsquivel/Proyecto-3/pull/8"},"issue":{"href":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/issues/8"},"comments":{"href":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/issues/8/comments"},"review_comments":{"href":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/8/comments"},"review_comment":{"href":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/pulls/8/commits"},"statuses":{"href":"https://api.github.com/repos/jcdEsquivel/Proyecto-3/statuses/92a21e4a84e030b855aa5d4a36a1ffd6b41424c9"}}}}