iotcat
/
cp-acc
mirror of https://github.com/IoTcat/cp-acc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

before chart

Browse Source
master
cn.yimian.xyz 4 years ago
parent c15eeb381a
commit 8e00417fc9
8 changed files with 95 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      api/createTable.php
  2. 12
      api/functions.php
  3. 4
      api/getData.php
  4. 4
      api/newItem.php
  5. 3
      api/updateTable.php
  6. 61
      index.html
  7. 32
      records.html
  8. 16
      setTable.html

4
api/createTable.php
Unescape View File

@ -34,6 +34,6 @@ db__pushData($cnn, "user", array(
));
return json_encode(array(
echo json_encode(array(
"tableId" => $tableId
));
));

12
api/functions.php
Unescape View File

@ -592,7 +592,7 @@ function getPostHttpBody($param)
/* sms */
require __DIR__ . "/../../lib/qcloudsms/src/index.php";
require __DIR__ . "/../../../lib/qcloudsms/src/index.php";
use Qcloud\Sms\SmsSingleSender;
use Qcloud\Sms\SmsMultiSender;
@ -656,7 +656,7 @@ function getItems($cnn, $tableId){
return db__getData($cnn, "account", "table", $tableId);
}
function getTableInfo($cnn, $tableId){
$res = db__getData($cnn, "table", "table", $tableId);
$res = db__getData($cnn, "table", "id", $tableId);
return $res[0];
}
function getTableData($cnn, $tableId){
@ -675,7 +675,7 @@ function getTableDataByUsers($cnn, $tableId){
array_push($arr, $item);
}
}
array_push($o['itemsByUser'], $arr);
$o['itemsByUser'][$user] = $arr;
}
return $o;
}
@ -716,7 +716,7 @@ function getUsersInfo($tableData){
$auth = db__connect("","","","auth");
$tableData['usersName'] = array();
foreach($tableData['users'] as $user){
array_push($tableData['usersName'], db__getData($auth, "account", "hash", $user)[0]['nickname']);
$tableData['usersName'][$user] = db__getData($auth, "account", "hash", $user)[0]['nickname'];
}
return $tableData;
}
@ -725,8 +725,8 @@ function getUsersInfo($tableData){
function getFinalData($cnn, $tableId){
$d = getTableDataByUsers($cnn, $tableId);
$o = getTotals($d);
$o = getAverage($o);
$o = getUsersInfo($o);
$o = getAverage($o);
return $o;
}
@ -795,4 +795,4 @@ function setBalance($first, $last, $threshold, $tableId, $cnn){
感谢您使用本站服务，祝您生活愉悦！
呓喵酱(@iotcat)", "CP-ACC");
}
}

4
api/getData.php
Unescape View File

@ -7,7 +7,7 @@ $hash = $_REQUEST['hash'];
if(!isset($hash)) die();
$cnn = connect();
$cnn = db__connect();
$res = db__getData($cnn, "user", "user", $hash, "state", '1');
$o = [];
@ -18,4 +18,4 @@ foreach($res as $item){
echo json_encode($o);
echo json_encode($o);

4
api/newItem.php
Unescape View File

@ -7,7 +7,7 @@ $url = $_REQUEST['url'];
$passby = $_REQUEST['passby'];
if(!isset($hash) || !isset($passby)) die();
if(!isset($url) || !isset($passby)) die();
$passby = json_decode(base64_decode($passby), true);
@ -49,4 +49,4 @@ while(!checkBalance($data, $threshold)){
header("Location: https://cp-acc.yimian.xyz/");
header("Location: https://cp-acc.yimian.xyz/");

3
api/updateTable.php
Unescape View File

@ -15,8 +15,7 @@ db__pushData($cnn, "table", array(
"state" => '1',
"name" => $name,
"threshold" => $threshold,
"created_by" => $hash,
"created_at" => date("Y-m-d H:i:s", time())
"updated_at" => date("Y-m-d H:i:s", time())
), array(
"id" => $tableId
));

61
index.html
Unescape View File

@ -51,7 +51,7 @@
</li>
<li class="">
<a href="setTable.html"><img src="img/content/icons/11.png" alt=""><strong>Settings</strong> </a>
<a href="#" id="setTable"><img src="img/content/icons/11.png" alt=""><strong>Setting</strong> </a>
</li>
<li class="">
<a href="https://login.yimian.xyz/logout.html" data-loader="show"><img src="https://cdn.yimian.xyz/smart-settlement/img/content/icons/7.png" alt=""><strong>Log out</strong></a>
@ -97,7 +97,7 @@
<div class="dash-balance">
<div class="dash-content relative">
<h3 class="w-text">ERP for CP Home</h3>
<h3 class="w-text" id="title"></h3>
<div class="notification">
<h3 class="w-text" id="usr">xxx</h3>
</div>
@ -110,7 +110,7 @@
<div class="d-flex flex-grow">
<div class="mr-auto">
<h1 class="b-val"> £<span id="week-avg"></span> </h1>
<p class="g-text mb-10">Weekly Payment</p>
<p class="g-text mb-10">Average Daily Payment</p>
<div class="badge badge-pill" id="week-avg-rate"> 43.55% <i style="color:red;" class="fa fa-arrow-down ml-10"></i></div>
</div>
<div class="ml-auto align-self-end">
@ -276,8 +276,8 @@
<script src="https://cdn.yimian.xyz/smart-settlement/plugins/jquery-sparkline/jquery.sparkline.js"></script>
<!-- Template global script file. requared all pages -->
<script src="https://cdn.yimian.xyz/smart-settlement/js/app-charts.js"></script>
<script src="https://cdn.yimian.xyz/smart-settlement/js/global.script.js"></script>
<!--<script src="./js/app-charts.js"></script>-->
<script src="./js/global.script.js"></script>
<script type="text/javascript">
@ -295,8 +295,30 @@
return;
}
if(cookie.get('tableId')){
var id = -1;
for(var i = 0; i < data.length; i ++){
if(data[i].id == cookie.get('tableId')){
data = data[i];
id = i;
}
}
if(id == -1){
cookie.set('tableId', data[0].id);
data = data[0];
}
}else{
cookie.set('tableId', data[0].id);
data = data[0];
}
window.data = data;
$('#setTable').click(function(){
window.location.href="./setTable.html?tableId="+data.id;
});
$('#title').html(data.name);
$('#usr').html('Hi~ '+session.get('nickname'));
$('#total').html(Number(data.total));
$('#total-usr').html(Number(data['actualTotals'][session.get('hash')]));
@ -305,16 +327,15 @@
var lastWeekTotal, lastSecodeWeekTotal;
data.items.foreach(function(item)=>{
if(item.tiemstamp > new Date().valueOf() - 7*24*60*1000){
lastWeekTotal += item.value;
}else if(item.tiemstamp > new Date().valueOf() - 14*24*60*1000){
lastSecodeWeekTotal += item.value;
var lastWeekTotal = Number(0), lastSecodeWeekTotal = Number(0);
data.items.forEach(function(item){
if(item.timestamp > new Date().valueOf()/1000 - 7*24*60){
lastWeekTotal += Number(item.value);
}else if(item.timestamp > new Date().valueOf()/1000 - 14*24*60){
lastSecodeWeekTotal += Number(item.value);
}
});
$('#week-avg').html(Number(lastWeekTotal/7).toFixed(2));
$('#total-bar').css('width', (data['actualTotals'][session.get('hash')] / lastWeekTotal)*100+'%');
if(lastWeekTotal > lastSecodeWeekTotal) $('#week-avg-rate').html(((lastWeekTotal - lastSecodeWeekTotal)/lastSecodeWeekTotal).toFixed(2)+'% <i style="color:red;" class="fa fa-arrow-up ml-10"></i>');
@ -323,7 +344,7 @@
var show = [];
for(var i = data['items'].length; i > data['items'].length-10; i --){
for(var i = data['items'].length - 1; i > data['items'].length-10 && i >= 0; i --){
if(data['items'][i]['value'] > 0 && data['items'][i]['type'] != 'innerT')
show.push(data['items'][i]);
}
@ -342,7 +363,8 @@
s += `.png" alt="coin image">
<div class="ml-10">
<h4 class="coin-name">`;
s += i.type;
if(i.type == 'external') s += 'payment';
if(i.type == 'innerF') s += 'circulation';
if(i.type == "external") s += ' - ' + data.usersName[i.user]
if(i.type == "innerF" && !i.state) s += ' - ' + data.usersName[i.user] + ' -> ' + data.usersName[i.comments];
if(i.type == "innerF" && i.state) s += ' - ' + data.usersName[i.user] + ' 👍 ' + data.usersName[i.comments];
@ -354,7 +376,7 @@
</div>
<div>
`;
if(i.type == 'external') s += `<small class="d-block mb-0 txt-red">£`+(i.value.toFixed(2) + `</small>`;
if(i.type == 'external') s += `<small class="d-block mb-0 txt-red">£`+(Number(i.value).toFixed(2) )+ `</small>`;
s += `
<small class="text-muted d-block">£`;
@ -486,8 +508,8 @@
alert('illegal input');
return;
}
window.location.href='https://imgbed.yimian.xyz/imgbed/api.html?redirect=https://cp-acc.yimian.xyz/api/newItem.php&passby='+btoa(JSON.stringify({
tableId: data.id,
window.location.href='https://imgbed.yimian.xyz/api.html?redirect=https://cp-acc.yimian.xyz/api/newItem.php&passby='+btoa(JSON.stringify({
tableId: cookie.get('tableId'),
hash: session.get('hash'),
value: $("#aaa").val()
}));
@ -571,7 +593,10 @@ function confirm(created_at){
return value;
}
</script>
<script>
</script>
</body>
</html>
</html>

32
records.html
Unescape View File

@ -59,7 +59,7 @@
<!-- Header area start -->
<header class="no-background"> <!-- extra class no-background -->
<a class="go-back-link" href="javascript:history.back();"><i class="fa fa-arrow-left"></i></a>
<a class="go-back-link" href="./"><i class="fa fa-arrow-left"></i></a>
<div class="search-button" data-search="open">
<img id="no-icon" src="img/content/notification-no.png" class="not-icon1" alt="">
<img id="no-icon2" src="img/content/notification2-no.png" class="not-icon2" alt="">
@ -93,7 +93,7 @@
<div class="dash-balance">
<div class="dash-content relative">
<h3 class="w-text">ERP for CP Home</h3>
<h3 class="w-text" id="title"></h3>
<div class="notification">
<h3 class="w-text" id="usr">xxx</h3>
</div>
@ -155,7 +155,29 @@
alert('请先创建一个公共账户！');
window.location.href="./setTable.html";
return;
}
}
if(cookie.get('tableId')){
var id = -1;
for(var i = 0; i < data.length; i ++){
if(data[i].id == cookie.get('tableId')){
data = data[i];
id = i;
}
}
if(id == -1){
cookie.set('tableId', data[0].id);
data = data[0];
}
}else{
cookie.set('tableId', data[0].id);
data = data[0];
}
window.data = data;
$('#title').html(data.name);
$('#usr').html(session.get('nickname'));
var s = '';
@ -180,7 +202,7 @@
s += `<small class="d-block mb-0 txt-red">£-`+Number(i.value).toFixed(2) + `</small>`;
s += `
<small class="text-muted d-block"><a href='`+i.url+`'>see invoice</a></small>
<small class="text-muted d-block"><a href='`+atob(i.url)+`'>see invoice</a></small>
</div>
</div>
</li>
@ -373,4 +395,4 @@ function confirm(created_at){
</body>
</html>
</html>

16
setTable.html
Unescape View File

@ -26,7 +26,7 @@
<div class="wrapper-inline">
<!-- Header area start -->
<header> <!-- extra class no-background -->
<a class="go-back-link" href="javascript:history.back();"><i class="fa fa-arrow-left"></i></a>
<a class="go-back-link" href="./"><i class="fa fa-arrow-left"></i></a>
<h1 class="page-title">设置公共账户信息</h1>
</header>
@ -61,8 +61,8 @@
</div>
<br/><br/>
<div id="qr" align="center" style="display: none;">
<p>请让成员点击链接或扫描二维码加入账户：</p>
<input type="text" id="url">
<p>请让成员打开链接或扫描二维码加入账户：</p>
<input width="60%" type="text" id="url">
<div id="qrcode"></div>
</div>
</div>
@ -100,6 +100,14 @@
session.onload(function(){
if(page.params.hasOwnProperty('tableId')){
$.get('./api/getData.php?hash='+session.get('hash'), function(data){
data.forEach(function(item){
if(item.id == page.params.tableId){
$('#name').val(item.name);
$('#threshold').val(item.threshold);
}
});
});
$('#qr').show();
$('#url').val('https://cp-acc.yimian.xyz/?type=join&tableId='+page.params.tableId);
qrcode.makeCode('https://cp-acc.yimian.xyz/?type=join&tableId='+page.params.tableId);
@ -127,4 +135,4 @@ session.onload(function(){
</body>
</html>
</html>

Write Preview
Loading…
Cancel
Save