Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fc-pregmod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
macaronideath
fc-pregmod
Commits
ad6983b7
Commit
ad6983b7
authored
4 years ago
by
brickode
Browse files
Options
Downloads
Patches
Plain Diff
Minor childrenReport cleanup
parent
5e05e9c9
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/facilities/nursery/nursery.tw
+0
-18
0 additions, 18 deletions
src/facilities/nursery/nursery.tw
src/facilities/nursery/widgets/reports/childrenReport.js
+2
-24
2 additions, 24 deletions
src/facilities/nursery/widgets/reports/childrenReport.js
with
2 additions
and
42 deletions
src/facilities/nursery/nursery.tw
+
0
−
18
View file @
ad6983b7
...
@@ -394,24 +394,6 @@
...
@@ -394,24 +394,6 @@
<br>
<br>
<<includeDOM App.Facilities.Nursery.childList()>>
<<includeDOM App.Facilities.Nursery.childList()>>
/*
FIXME: not sure if this works
<<set $newSlavePool = []>>
<<for _nur = 0; _nur < $cribs.length; _nur++>>
<<if $cribs[_nur].growTime <= 0>>
<<set $nurseryOldID = $cribs[_nur].ID>> /* single slave case *//*
<<set _tempObject = {object: $cribs[_nur], ID: $cribs[_nur].ID}>>
<<set $newSlavePool.push(clone(_tempObject))>>
<<run $cribs.splice(_nur, 1)>>
<<set _nur-->>
<</if>>
<</for>>
<<if $newSlavePool.length == 1>>
<<set $readySlave = $newSlavePool[0].object>>
<<set $newSlavePool = 0>>
<</if>>
*/
</div>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
src/facilities/nursery/widgets/reports/childrenReport.js
+
2
−
24
View file @
ad6983b7
...
@@ -13,31 +13,9 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
...
@@ -13,31 +13,9 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
let
let
r
=
``
;
r
=
``
;
for
(
let
i
=
0
;
i
<
CL
;
i
++
)
{
for
(
const
child
of
V
.
cribs
)
{
const
const
child
=
V
.
cribs
[
i
];
{
he
,
his
,
He
,
His
}
=
getPronouns
(
child
);
// {
// he, him, his, He, His
// } = getPronouns(child);
let
he
,
his
,
him
,
He
,
His
;
// FIXME: get pronoun system to work with child objects
if
(
child
.
genes
===
"
XX
"
)
{
he
=
"
she
"
,
him
=
"
her
"
,
his
=
"
her
"
;
}
else
{
he
=
"
he
"
,
him
=
"
him
"
,
his
=
"
his
"
;
}
He
=
capFirstChar
(
he
),
His
=
capFirstChar
(
his
);
if
(
child
.
growTime
>
0
)
{
if
(
child
.
growTime
>
0
)
{
r
+=
`<br><span class="pink">
${
child
.
slaveName
}
</span> is growing steadily.
${
He
}
will be ready for release in about
${
years
(
child
.
growTime
)}
. `
;
r
+=
`<br><span class="pink">
${
child
.
slaveName
}
</span> is growing steadily.
${
He
}
will be ready for release in about
${
years
(
child
.
growTime
)}
. `
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment