リファクタリング。

[nucalgen] / nucalgen / pfc-balance.xml

diff --git a/nucalgen/pfc-balance.xml b/nucalgen/pfc-balance.xml
index 5ed29f092d65d1b3b947c6f979a9c5ebaac16a77..c8d7092da3b651b82e8b0da95f1670e2fd8eb5b7 100644 (file)
--- a/nucalgen/pfc-balance.xml
+++ b/nucalgen/pfc-balance.xml
@@ -1,47 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <addition>
        <row>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value>PFCバランス (%) 七訂の方法で計算したエネルギー量で計算</value></cell>
+               <cell />
+               <cell><value>PFCバランス (%) 七訂の方法で計算したエネルギー量で計算</value></cell>
        </row>
        <row>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value>P</value></cell>
-               <cell><type>string</type><value>F</value></cell>
-               <cell><type>string</type><value>C</value></cell>
+               <cell />
+               <cell />
+               <cell />
+               <cell><value>P</value></cell>
+               <cell><value>F</value></cell>
+               <cell><value>C</value></cell>
+               <cell />
+               <cell><value>飽和脂肪酸</value></cell>
        </row>
        <row>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>formula</type><value>ROUND(SUM_P*4*100/SUM_KCAL,0)</value><alias>PFC_BALANCE_P_7</alias></cell>
-               <cell><type>formula</type><value>ROUND(SUM_F*9*100/SUM_KCAL,0)</value><alias>PFC_BALANCE_F_7</alias></cell>
-               <cell><type>formula</type><value>100-(PFC_BALANCE_P_7+PFC_BALANCE_F_7)</value></cell>
+               <cell />
+               <cell />
+               <cell />
+               <cell><formula>ROUND(SUM_P*4*100/SUM_KCAL,0)</formula><alias>PFC_BALANCE_P_7</alias></cell>
+               <cell><formula>ROUND(SUM_F*9*100/SUM_KCAL,0)</formula><alias>PFC_BALANCE_F_7</alias></cell>
+               <cell><formula>100-(PFC_BALANCE_P_7+PFC_BALANCE_F_7)</formula></cell>
+               <cell />
+               <cell><formula>ROUND(SUM_FASAT*9*100/SUM_KCAL,1)</formula></cell>
        </row>
 
-       <row></row>
+       <row />
 
        <row>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value>PFCバランス (%) 八訂のエネルギー量で計算</value></cell>
+               <cell />
+               <cell><value>PFCバランス (%) 八訂のエネルギー量で計算</value></cell>
        </row>
        <row>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value>P</value></cell>
-               <cell><type>string</type><value>F</value></cell>
-               <cell><type>string</type><value>C</value></cell>
+               <cell />
+               <cell />
+               <cell />
+               <cell><value>P</value></cell>
+               <cell><value>F</value></cell>
+               <cell><value>C</value></cell>
+               <cell />
+               <cell><value>飽和脂肪酸</value></cell>
        </row>
        <row>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>string</type><value></value></cell>
-               <cell><type>formula</type><value>ROUND(SUM_P_ENG*4*100/SUM_KCAL,0)</value><alias>PFC_BALANCE_P_8</alias></cell>
-               <cell><type>formula</type><value>ROUND(SUM_F_ENG*9*100/SUM_KCAL,0)</value><alias>PFC_BALANCE_F_8</alias></cell>
-               <cell><type>formula</type><value>100-(PFC_BALANCE_P_8+PFC_BALANCE_F_8)</value></cell>
+               <cell />
+               <cell />
+               <cell />
+               <cell><formula>ROUND(SUM_P_ENG*4*100/SUM_KCAL,0)</formula><alias>PFC_BALANCE_P_8</alias></cell>
+               <cell><formula>ROUND(SUM_F_ENG*9*100/SUM_KCAL,0)</formula><alias>PFC_BALANCE_F_8</alias></cell>
+               <cell><formula>100-(PFC_BALANCE_P_8+PFC_BALANCE_F_8)</formula></cell>
+               <cell />
+               <cell><formula>ROUND(SUM_FASAT*9*100/SUM_KCAL,1)</formula></cell>
        </row>