Skip to content

Commit

Permalink
Fixed the activity no detailed information when offline
Browse files Browse the repository at this point in the history
  • Loading branch information
feiyunzhou committed May 29, 2013
1 parent 746ba62 commit 70703c8
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 129 deletions.
66 changes: 66 additions & 0 deletions crm/src/main/webapp/js/activityUI.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
$(document).ready(function() {
$('#active_back_btn').click(function(e) {
$('#main_container').toggle();
$('#activity_container').toggle();

});

});

function renderActivityTableOnPage(id) {
console.log("Start to render account detaile page now");
console.log("activity id is:" + id);

//get accountTable from local storage
var table = ACTIVITY_UTIL.getRemoteActivitesFromLocalStorage();
console.log(table);
var tbobj = $("#detail_tb");
tbobj.empty();
var isEventLocated = false;
if (table != null && table.cols != undefined && table.tData != undefined) {

if (table.cols.length > 0 && (table.tData[id] != undefined) && (table.tData[id] != null)) {
isEventLocated = true;
var cols = table.cols;
var colWidth = table.cols.length;
var trs = "";
var rowData = table.tData[id][0];
$('#detail_title').append("<span>" + rowData[1] + "</span>");
for ( var i = 1; i < colWidth; i++) {
if (cols[i].isVisible === false)
continue;
if (i == 2 || i == 3) {
var date = new Date(parseInt(rowData[i]));
console.log(date);
var str_date = $.fullCalendar.formatDate(date, "yyyy-MM-dd HH:mm:ss");
trs = trs + "<tr>" + "<td style=\"text-align:left;font-weight:bold\">" + cols[i].display + "</td>" + "<td style=\"text-align:right\">" + str_date + "</td>" + "</tr>";
} else {
trs = trs + "<tr>" + "<td style=\"text-align:left;font-weight:bold\">" + cols[i].display + "</td>" + "<td style=\"text-align:right\">" + rowData[i] + "</td>" + "</tr>";
}
}

tbobj.append("<tbody>" + trs + "</tbody>");
}
}

//if we can't find the event in the remote data
if (!isEventLocated) {
var events = ACTIVITY_UTIL.getCalendarEventFromLocalStorage();
if (events[id] != undefined) {
var evt = events[id];
var date = new Date(evt.startt*1000);
var starttime = $.fullCalendar.formatDate(date, "yyyy-MM-dd HH:mm");
date = new Date(evt.endt*1000);
var endtime = $.fullCalendar.formatDate(date, "yyyy-MM-dd HH:mm");
$('#detail_title').append("<span>拜访</span>");
var trs = "<tbody>" + "<tr>" + "<td style=\"text-align:left;font-weight:bold\">开始时间:</td>" + "<td style=\"text-align:right\" >" + starttime + "</td></tr>" + "<tr>"
+ "<td style=\"text-align:left;font-weight:bold\">结束时间:</td>" + "<td style=\"text-align:right\">" + endtime + "</td></tr>" + "<tr>"
+ "<td style=\"text-align:left;font-weight:bold\">拜访类型:</td>" + "<td style=\"text-align:right\">" + ACTIVITY_UTIL.getEventTitle(evt.activity_type) + "</td></tr>" + "</tbody>";

tbobj.append(trs);

}
}

console.log("END of render activity detaile page now");
}
117 changes: 0 additions & 117 deletions crm/src/main/webapp/offline/activity.html

This file was deleted.

2 changes: 1 addition & 1 deletion crm/src/main/webapp/offline/cache.appcache
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ NETWORK:
CACHE:
../offline/main.html
../offline/account.html
../offline/activity.html
../fullcalendar/fullcalendar.css
../fullcalendar/fullcalendar.print.css
../jquery/css/smoothness/jquery-ui-1.10.2.custom.css
Expand Down Expand Up @@ -47,6 +46,7 @@ CACHE:
../urlparser/purl.js
../bootstrap/css/bootstrap-responsive.css
../js/activityutil.js
../js/activityUI.js
../offline/offline.css

FALLBACK:
36 changes: 25 additions & 11 deletions crm/src/main/webapp/offline/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<link href="../bootstrap/css/bootstrap-responsive.css" rel="stylesheet">

<script src="../js/activityutil.js"></script>
<script src="../js/activityUI.js"></script>
<link href="../offline/offline.css" rel="stylesheet">
<script>

Expand Down Expand Up @@ -184,15 +185,9 @@
cell.css("min-height", "");
},
eventClick: function(calEvent, jsEvent, view) {

//alert('Event: ' + calEvent.id);
$('#main_container').toggle();
$('#activity_container').load("../offline/activity.html", function() {
console.log("loading completed.");
$('#activity_container').toggle();
renderActivityTableOnPage(calEvent.id);

});
$('#activity_container').toggle();
renderActivityTableOnPage(calEvent.id);

},
dayClick : function(date, allDay, jsEvent, view) {
Expand Down Expand Up @@ -989,8 +984,27 @@ <h4>第三页</h4>
<!-- Start of account container -->
<div id="account_container" style="display: none;">
</div>
<div id="activity_container" style="display: none;">
</div>
<!-- End of account container -->
<div id="activity_container" style="display: none;">
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<a href="#" class="btn btn-primary" id="active_back_btn">返回</a>
<hr />
</div>

</div>
</div>
<div class="container-fluid">
<div class="row-fluid">
<div class="span3 well">
<h5 id="detail_title"></h5>
<table id="detail_tb" class="table table-condensed" style="">

</table>
</div>
</div>
</div>
</div>
<!-- End of account container -->
</body>
</html>

0 comments on commit 70703c8

Please sign in to comment.