From 9058696e1bdbdd24af429c5f532cf9b9d8790e8d Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sat, 20 May 2023 12:19:51 -0400 Subject: [PATCH] Family acc --- wrenchboard/src/shared_tool/family_acc.cc | 7 +++++++ www-api/app/Models/ResultFormatter.php | 4 ++-- www-api/public/svs/user/formarter.php | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/wrenchboard/src/shared_tool/family_acc.cc b/wrenchboard/src/shared_tool/family_acc.cc index 267884fb..c24781b9 100644 --- a/wrenchboard/src/shared_tool/family_acc.cc +++ b/wrenchboard/src/shared_tool/family_acc.cc @@ -91,6 +91,13 @@ long WrenchFamilyList(CVars in, CVars &out){ snprintf(vname, sizeof (vname), "age_%05d", i); out[vname] = rec["age"]; + + snprintf(vname, sizeof (vname), "last_login_%05d", i); + out[vname] = rec["last_login"]; + + snprintf(vname, sizeof (vname), "task_count_%05d", i); + out[vname] = rec["task_count"]; + } } ret = PHP_API_OK; diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index aa561a76..abc3f5ae 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -140,8 +140,8 @@ class ResultFormatter extends Model "firstname" => $out["firstname_${key}"], "lastname" => $out["lastname_${key}"], "age" => $out["age_${key}"], - "last_login" => '10-10-2024', - "task_count" => rand(0,20), + "last_login" => $out["last_login_${key}"], + "task_count" => $out["task_count_${key}"], "added" => $out["added_${key}"], ); } diff --git a/www-api/public/svs/user/formarter.php b/www-api/public/svs/user/formarter.php index 6b3c6e53..c588f2c7 100755 --- a/www-api/public/svs/user/formarter.php +++ b/www-api/public/svs/user/formarter.php @@ -135,8 +135,8 @@ function processOutJson($in, $out) { "firstname" => $out["firstname_${key}"], "lastname" => $out["lastname_${key}"], "age" => $out["age_${key}"], - "last_login" => '10-10-2024', - "task_count" => rand(0,20), + "last_login" => $out["last_login_${key}"], + "task_count" => $out["task_count_${key}"], "added" => $out["added_${key}"], ); }