Bug #7 - Need to fetch Live feed from Aguda (via facebook)
This commit is contained in:
parent
dd69c43244
commit
56750aef77
6 changed files with 54 additions and 72 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -4,3 +4,4 @@
|
|||
node_modules/
|
||||
platforms/
|
||||
plugins/
|
||||
hooks/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<widget id="com.students.jce.mobile.app" version="0.1.28" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
|
||||
<widget id="com.students.jce.mobile.app" version="0.1.30" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
|
||||
<name>jceMobile</name>
|
||||
<description>
|
||||
Free Your Academic Data
|
||||
|
|
|
@ -38,6 +38,7 @@ starter.factory('ApiService', ['$http', '$ionicPopup', '$ionicModal', function (
|
|||
var password = window.localStorage['password'];
|
||||
var notes = window.localStorage['notes'] || null;
|
||||
var grades = window.localStorage['grades'] || null;
|
||||
var agudaPosts = window.localStorage['agudaPosts'] || null;
|
||||
|
||||
var request = "https://mipo.jce.ac.il/index.php/site/login?_dc=1419773997764&formValues=%7B%22form_fields%22%3A%7B%22name%22%3A%22"+username+"%22%2C%22pwd%22%3A%22"+password+"%22%7D%7D";
|
||||
|
||||
|
@ -65,22 +66,40 @@ starter.factory('ApiService', ['$http', '$ionicPopup', '$ionicModal', function (
|
|||
});
|
||||
|
||||
//Get Grades
|
||||
$http.get("https://mipo.jce.ac.il/index.php/site/studentGrades").then(function(resp) {
|
||||
console.log('Success', resp);
|
||||
console.log("[JCE] [INFO] : in update - Got Grades!");
|
||||
if(grades === null){
|
||||
window.localStorage['newGrades'] = "true";
|
||||
window.localStorage['grades'] = JSON.stringify(resp.data);
|
||||
}else if(grades === JSON.stringify(resp.data)){
|
||||
console.log("[JCE] [INFO] : in update - no new Grades");
|
||||
}else{
|
||||
window.localStorage['newGrades'] = "true";
|
||||
window.localStorage['grades'] = JSON.stringify(resp.data);
|
||||
}
|
||||
|
||||
}, function(err) {
|
||||
console.error('[JCE] [INFO] : in update - can\'t get Grades', err);
|
||||
});
|
||||
$http.get("https://mipo.jce.ac.il/index.php/site/studentGrades").then(function(resp) {
|
||||
console.log('Success', resp);
|
||||
console.log("[JCE] [INFO] : in update - Got Grades!");
|
||||
if(grades === null){
|
||||
window.localStorage['newGrades'] = "true";
|
||||
window.localStorage['grades'] = JSON.stringify(resp.data);
|
||||
}else if(grades === JSON.stringify(resp.data)){
|
||||
console.log("[JCE] [INFO] : in update - no new Grades");
|
||||
}else{
|
||||
window.localStorage['newGrades'] = "true";
|
||||
window.localStorage['grades'] = JSON.stringify(resp.data);
|
||||
}
|
||||
|
||||
}, function(err) {
|
||||
console.error('[JCE] [INFO] : in update - can\'t get Grades', err);
|
||||
});
|
||||
|
||||
//Get Aguda Posts
|
||||
$http.get("https://ajax.googleapis.com/ajax/services/feed/load?v=2.0&num=10&q=https://www.facebook.com/feeds/page.php?id=597726260353610%26format=rss20").then(function(resp) {
|
||||
console.log('Success', resp);
|
||||
console.log("[JCE] [INFO] : in update - Got Aguda from Facebook!");
|
||||
if(grades === null){
|
||||
window.localStorage['newAguda'] = "true";
|
||||
window.localStorage['newAguda'] = JSON.stringify(resp.data);
|
||||
}else if(grades === JSON.stringify(resp.data)){
|
||||
console.log("[JCE] [INFO] : in update - no new newAguda");
|
||||
}else{
|
||||
window.localStorage['newAguda'] = "true";
|
||||
window.localStorage['agudaPosts'] = JSON.stringify(resp.data);
|
||||
}
|
||||
|
||||
}, function(err) {
|
||||
console.error('[JCE] [INFO] : in update - can\'t get Aguda Posts from Facebook', err);
|
||||
});
|
||||
|
||||
//Get Calendar
|
||||
//https://mipo.jce.ac.il/index.php/site/timetable
|
||||
|
|
|
@ -238,10 +238,12 @@ angular.module('starter.controllers', [])
|
|||
|
||||
|
||||
.controller('AgudaCtrl', function($scope, $stateParams, $http) {
|
||||
var notesStr = window.localStorage['notes'] || null;
|
||||
console.log(notesStr);
|
||||
if(notesStr != null)
|
||||
$scope.newss = JSON.parse(notesStr);
|
||||
var aguda = window.localStorage['agudaPosts'] || null;
|
||||
console.log(aguda);
|
||||
console.log("[JCE] [INFO] at AgudaCtrl if there is a print. its OK");
|
||||
if(aguda != null){
|
||||
$scope.agudaAll = JSON.parse(aguda);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -460,7 +462,7 @@ angular.module('starter.controllers', [])
|
|||
}
|
||||
};
|
||||
//////////////////////////////////////////////////////////
|
||||
$scope.version = "0.1.28alpha-develop_perview";
|
||||
$scope.version = "0.1.30alpha-develop_perview";
|
||||
/////////////////////////////////////////////////////////
|
||||
|
||||
});
|
||||
|
|
|
@ -2,23 +2,19 @@
|
|||
<ion-content>
|
||||
<div class="page-content">
|
||||
|
||||
<h1><i class="icon ion-speakerphone"></i> אגודת הסטודנטים</h1>
|
||||
<h1><i class="icon ion-speakerphone"></i> אגודת הסטודנטים</h1>
|
||||
|
||||
<h3><i class="icon ion-android-hand"></i> גרסת פיתוח - הנתונים כאן לא מתעדכנים!</h3>
|
||||
<div class="list card" ng-repeat="post in agudaAll.responseData.feed.entries">
|
||||
|
||||
<div class="item item-avatar">
|
||||
<img src="https://fbcdn-profile-a.akamaihd.net/hprofile-ak-xpa1/v/t1.0-1/p200x200/10660171_597727170353519_3762039883805959255_n.jpg?oh=f4f4498e2f3e8fc29eaf046695ce6246&oe=55319C44&__gda__=1429862649_ff1a6a29c78ac73534f8caa69bb921a6">
|
||||
<h2>{{post.contentSnippet}}</h2>
|
||||
<p>{{post.publishedDate}}</p>
|
||||
</div>
|
||||
|
||||
<div class="list card">
|
||||
<div class="item item-body">
|
||||
<div ng-bind-html="post.content"></div>
|
||||
|
||||
<div class="item item-avatar">
|
||||
<img src="https://fbcdn-profile-a.akamaihd.net/hprofile-ak-xpa1/v/t1.0-1/p200x200/10660171_597727170353519_3762039883805959255_n.jpg?oh=f4f4498e2f3e8fc29eaf046695ce6246&oe=55319C44&__gda__=1429862649_ff1a6a29c78ac73534f8caa69bb921a6">
|
||||
<h2>פאנג'ויה!</h2>
|
||||
<p>November 05, 1955</p>
|
||||
</div>
|
||||
|
||||
<div class="item item-body">
|
||||
<img class="full-image" src="https://fbcdn-sphotos-g-a.akamaihd.net/hphotos-ak-xaf1/v/t1.0-9/1898014_629613757164860_1428183927370833321_n.png?oh=3a7d21d83b367c68f8c7af0bf528c93c&oe=55230A4A&__gda__=1428269364_9e26d1101e08635866a2d5168bf13f1d">
|
||||
<div class="text_exposed_show"><p> את הטפסים יש לשלוח בדיוק בשעה שקיבלתם בהרשמה לתורים.</p><p> *** טפסים להורדה:<br> <a href="http://l.facebook.com/l.php?u=http%3A%2F%2Fwww.funjoya.co.il%2Ffunjoya-form-jr2015.pdf&h=IAQGePLbI&enc=AZNgfLFvrlzZgREmMwCTTN8FYRL6jTPY4DAqatA7mFQcdhVZeZHoVsAloKsbagl_lboUl4amzUgHeSpTm8Mw_Zs3jU-kkuK5NrddVxVRDHVeeUhLqXGKtZSK-8b897RPlAXxp2qXTmnZNWT1oo56ghjMZUkenEWlBJIV9uY2FiL09g&s=1" target="_blank" rel="nofollow" onmouseover="LinkshimAsyncLink.swap(this, "http:\/\/www.funjoya.co.il\/funjoya-form-jr2015.pdf");" onclick="LinkshimAsyncLink.referrer_log(this, "http:\/\/www.funjoya.co.il\/funjoya-form-jr2015.pdf", "\/si\/ajax\/l\/render_linkshim_log\/?u=http\u00253A\u00252F\u00252Fwww.funjoya.co.il\u00252Ffunjoya-form-jr2015.pdf&h=IAQGePLbI&render_verification=0&enc=AZNgfLFvrlzZgREmMwCTTN8FYRL6jTPY4DAqatA7mFQcdhVZeZHoVsAloKsbagl_lboUl4amzUgHeSpTm8Mw_Zs3jU-kkuK5NrddVxVRDHVeeUhLqXGKtZSK-8b897RPlAXxp2qXTmnZNWT1oo56ghjMZUkenEWlBJIV9uY2FiL09g&d");">www.funjoya.co.il/funjoya-form-jr2015.pdf</a></p><p> ***בעת הגשת הטפסים פיזית/בדוא"ל יתבצע אימות לשעה ולתאריך ע"פ מספר תעודת הזהות. סטודנט אשר לא יפעל על פי ההוראות, הזמנתו לא תתקבל.</p></div>
|
||||
<p>
|
||||
<a href="#" class="subdued">1 Like</a>
|
||||
<a href="#" class="subdued">5 Comments</a>
|
||||
</p>
|
||||
|
@ -41,42 +37,6 @@
|
|||
|
||||
</div>
|
||||
|
||||
<!-- ============================= -->
|
||||
<div class="list card">
|
||||
|
||||
<div class="item item-avatar">
|
||||
<img src="https://fbcdn-profile-a.akamaihd.net/hprofile-ak-xpa1/v/t1.0-1/p200x200/10660171_597727170353519_3762039883805959255_n.jpg?oh=f4f4498e2f3e8fc29eaf046695ce6246&oe=55319C44&__gda__=1429862649_ff1a6a29c78ac73534f8caa69bb921a6">
|
||||
<h2>טורניר שש בש</h2>
|
||||
<p>November 04, 2014</p>
|
||||
</div>
|
||||
|
||||
<div class="item item-body">
|
||||
<img class="full-image" src="https://fbcdn-sphotos-h-a.akamaihd.net/hphotos-ak-xap1/v/t1.0-9/p417x417/10891889_637354646390771_1252827847419502090_n.jpg?oh=b649575085a21b62f4b899415f85b166&oe=553F1956&__gda__=1429216008_06dddb40d81bfb5ef72efe2fd0db2fd6">
|
||||
הטורניר השנתי ממשיך...
|
||||
<p>
|
||||
<a href="#" class="subdued">7 Like</a>
|
||||
<a href="#" class="subdued">5 Comments</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="item tabs tabs-secondary tabs-icon-left">
|
||||
<a class="tab-item" href="#">
|
||||
<i class="icon ion-thumbsup"></i>
|
||||
Like
|
||||
</a>
|
||||
<a class="tab-item" href="#">
|
||||
<i class="icon ion-chatbox"></i>
|
||||
Comment
|
||||
</a>
|
||||
<a class="tab-item" href="#">
|
||||
<i class="icon ion-share"></i>
|
||||
Share
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<center>
|
||||
<div style="width: 30%; height: 30%">
|
||||
<img src="https://camo.githubusercontent.com/796c0e156ff48c9985296e03d55017f8adefd154/687474703a2f2f6c6972616e62672e6769746875622e696f2f4a63654d616e616765722f6173736574732f696d616765732f6c6f676f2e706e67" alt="" style="width: 100%">
|
||||
<img src="https://cloud.githubusercontent.com/assets/2984053/5891657/4cc6526e-a4ab-11e4-9968-1289ebd33d69.png" alt="" style="width: 100%">
|
||||
</div>
|
||||
</center>
|
||||
|
||||
|
|
Loading…
Reference in a new issue